Skip to content
Snippets Groups Projects
Commit e7166821 authored by abat's avatar abat
Browse files

Merge into master from pull request #82:

Initialize modules listed in the config file first then dependencies. (https://github.com/floodlight/floodlight/pull/82)
parents 755b9cc2 6b711ff7
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ public class FloodlightModuleLoader { ...@@ -58,7 +58,7 @@ public class FloodlightModuleLoader {
* @throws FloodlightModuleException If two modules are specified in the configuration * @throws FloodlightModuleException If two modules are specified in the configuration
* that provide the same service. * that provide the same service.
*/ */
protected static void findAllModules(Set<String> mList) throws FloodlightModuleException { protected static void findAllModules(Collection<String> mList) throws FloodlightModuleException {
synchronized (lock) { synchronized (lock) {
if (serviceMap != null) return; if (serviceMap != null) return;
serviceMap = serviceMap =
...@@ -156,7 +156,7 @@ public class FloodlightModuleLoader { ...@@ -156,7 +156,7 @@ public class FloodlightModuleLoader {
String moduleList = prop.getProperty(FLOODLIGHT_MODULES_KEY) String moduleList = prop.getProperty(FLOODLIGHT_MODULES_KEY)
.replaceAll("\\s", ""); .replaceAll("\\s", "");
Set<String> configMods = new HashSet<String>(); Collection<String> configMods = new ArrayList<String>();
configMods.addAll(Arrays.asList(moduleList.split(","))); configMods.addAll(Arrays.asList(moduleList.split(",")));
return loadModulesFromList(configMods, prop); return loadModulesFromList(configMods, prop);
} }
...@@ -167,7 +167,7 @@ public class FloodlightModuleLoader { ...@@ -167,7 +167,7 @@ public class FloodlightModuleLoader {
* @return The ModuleContext containing all the loaded modules * @return The ModuleContext containing all the loaded modules
* @throws FloodlightModuleException * @throws FloodlightModuleException
*/ */
public IFloodlightModuleContext loadModulesFromList(Set<String> configMods, Properties prop) public IFloodlightModuleContext loadModulesFromList(Collection<String> configMods, Properties prop)
throws FloodlightModuleException { throws FloodlightModuleException {
logger.debug("Starting module loader"); logger.debug("Starting module loader");
findAllModules(configMods); findAllModules(configMods);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment