From 6d6e9e4b935b68db69241ea86fbc05f0ac8a79e8 Mon Sep 17 00:00:00 2001
From: Gregor Maier <gregor.maier@bigswitch.com>
Date: Tue, 23 Apr 2013 13:11:39 -0700
Subject: [PATCH] Move initialization code from startupComponents to init
---
.../net/floodlightcontroller/core/internal/Controller.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index c787e4a55..faa907d53 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -1508,6 +1508,9 @@ public class Controller implements IFloodlightProviderService,
this.setAlwaysClearFlowsOnSwAdd(false);
log.info("Flush switches on reconnect -- Disabled");
}
+ this.roleManager = new RoleManager(this.notifiedRole,
+ INITIAL_ROLE_CHANGE_DESCRIPTION);
+ this.switchManager = new SwitchManager(this.notifiedRole);
}
/**
@@ -1537,9 +1540,7 @@ public class Controller implements IFloodlightProviderService,
restApi.addRestletRoutable(new CoreWebRoutable());
this.ses = threadPool.getScheduledExecutor();
- this.roleManager = new RoleManager(this.notifiedRole,
- INITIAL_ROLE_CHANGE_DESCRIPTION);
- this.switchManager = new SwitchManager(this.notifiedRole);
+
try {
this.syncService.registerStore(SWITCH_SYNC_STORE_NAME, Scope.LOCAL);
this.storeClient = this.syncService
--
GitLab