diff --git a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java index 363856695a526de68b304836a75140ebac041659..cb4263a90def48367e969168e540a28a35c8db20 100644 --- a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java +++ b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java @@ -58,7 +58,7 @@ public class FloodlightModuleLoader { * @throws FloodlightModuleException If two modules are specified in the configuration * 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) { if (serviceMap != null) return; serviceMap = @@ -156,7 +156,7 @@ public class FloodlightModuleLoader { String moduleList = prop.getProperty(FLOODLIGHT_MODULES_KEY) .replaceAll("\\s", ""); - Set<String> configMods = new HashSet<String>(); + Collection<String> configMods = new ArrayList<String>(); configMods.addAll(Arrays.asList(moduleList.split(","))); return loadModulesFromList(configMods, prop); } @@ -167,7 +167,7 @@ public class FloodlightModuleLoader { * @return The ModuleContext containing all the loaded modules * @throws FloodlightModuleException */ - public IFloodlightModuleContext loadModulesFromList(Set<String> configMods, Properties prop) + public IFloodlightModuleContext loadModulesFromList(Collection<String> configMods, Properties prop) throws FloodlightModuleException { logger.debug("Starting module loader"); findAllModules(configMods);