Merge pull request #8 from alexreimers/master

More modifications to controller init.

src/main/java/net/floodlightcontroller/core/internal/Controller.java

@@ -1395,9 +1395,10 @@ public class Controller
     protected void init() {
         topology = new TopologyImpl();
         deviceManager = new DeviceManagerImpl();
-        storageSource = new MemoryStorageSource();
         counterStore = new CounterStore();
         pktinProcTime = new PktinProcessingTime();
+        routingEngine = new RoutingImpl();
+        initStorageSource();
         
         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);