From ed5c4310ac20a37362cf95dbdec084b731879bb4 Mon Sep 17 00:00:00 2001
From: Ananth Suryanarayana <Ananth.Suryanarayana@bigswitch.com>
Date: Mon, 27 Aug 2012 09:34:45 -0700
Subject: [PATCH] minor cleanup
---
.../net/floodlightcontroller/core/Main.java | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/core/Main.java b/src/main/java/net/floodlightcontroller/core/Main.java
index 5a5bf9cdb..deea68449 100644
--- a/src/main/java/net/floodlightcontroller/core/Main.java
+++ b/src/main/java/net/floodlightcontroller/core/Main.java
@@ -14,11 +14,16 @@ import net.floodlightcontroller.restserver.IRestApiService;
* @author alexreimers
*/
public class Main {
-
- private static IFloodlightModuleContext moduleContext;
-
- public static IFloodlightModuleContext floodlightContextGet () {
- return moduleContext;
+
+ private static IFloodlightModuleContext staticModuleContext;
+
+ public static IFloodlightModuleContext getFloodlightContext () {
+ return staticModuleContext;
+ }
+
+ public static void setFloodlightContext (
+ IFloodlightModuleContext moduleContext) {
+ staticModuleContext = moduleContext;
}
/**
@@ -42,7 +47,10 @@ public class Main {
// Load modules
FloodlightModuleLoader fml = new FloodlightModuleLoader();
- moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
+ IFloodlightModuleContext moduleContext =
+ fml.loadModulesFromConfig(settings.getModuleFile());
+ setFloodlightContext(moduleContext);
+
// Run REST server
IRestApiService restApi = moduleContext.getServiceImpl(IRestApiService.class);
restApi.run();
--
GitLab