From d52e597432261c5dba4f7ce694ded6277effd675 Mon Sep 17 00:00:00 2001
From: Alex Reimers <alex@bigswitch.com>
Date: Tue, 10 Jan 2012 11:35:43 -0800
Subject: [PATCH] Moved storage source setup to it's own function.
---
.../floodlightcontroller/core/internal/Controller.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index 78f8969fb..365777081 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -1393,11 +1393,12 @@ public class Controller
* new components
*/
protected void init() {
+ initStorageSource();
topology = new TopologyImpl();
deviceManager = new DeviceManagerImpl();
- storageSource = new MemoryStorageSource();
counterStore = new CounterStore();
pktinProcTime = new PktinProcessingTime();
+ routingEngine = new RoutingImpl();
topology.setFloodlightProvider(this);
topology.setStorageSource(storageSource);
@@ -1408,7 +1409,6 @@ public class Controller
initMessageFilterManager();
initStaticFlowPusher();
- routingEngine = new RoutingImpl();
initForwarding();
// call this explicitly because it does setup
@@ -1430,6 +1430,10 @@ public class Controller
JacksonCustomConverter.replaceConverter();
}
+ protected void initStorageSource() {
+ storageSource = new MemoryStorageSource();
+ }
+
protected void initMessageFilterManager() {
messageFilterManager = new OFMessageFilterManager();
messageFilterManager.init(this);
--
GitLab