Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
floodlight
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
croft1
floodlight
Commits
6b711ff7
Commit
6b711ff7
authored
12 years ago
by
Alex Reimers
Browse files
Options
Downloads
Patches
Plain Diff
Initialize modules listed in the config file first then dependencies.
parent
755b9cc2
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
+3
-3
3 additions, 3 deletions
...odlightcontroller/core/module/FloodlightModuleLoader.java
with
3 additions
and
3 deletions
src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
+
3
−
3
View file @
6b711ff7
...
...
@@ -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
HashSe
t
<
String
>();
Collection
<
String
>
configMods
=
new
ArrayLis
t
<
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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment