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
50242748
Commit
50242748
authored
12 years ago
by
Alex Reimers
Browse files
Options
Downloads
Patches
Plain Diff
Change how modules are inited/started to be more deterministic.
parent
670806e9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
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
+5
-5
5 additions, 5 deletions
...odlightcontroller/core/module/FloodlightModuleLoader.java
with
5 additions
and
5 deletions
src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
+
5
−
5
View file @
50242748
...
...
@@ -172,7 +172,7 @@ public class FloodlightModuleLoader {
logger
.
debug
(
"Starting module loader"
);
findAllModules
(
configMods
);
Set
<
IFloodlightModule
>
moduleSet
=
new
HashSe
t
<
IFloodlightModule
>();
Collection
<
IFloodlightModule
>
moduleSet
=
new
ArrayLis
t
<
IFloodlightModule
>();
Map
<
Class
<?
extends
IFloodlightService
>,
IFloodlightModule
>
moduleMap
=
new
HashMap
<
Class
<?
extends
IFloodlightService
>,
IFloodlightModule
>();
...
...
@@ -253,7 +253,7 @@ public class FloodlightModuleLoader {
*/
protected
void
addModule
(
Map
<
Class
<?
extends
IFloodlightService
>,
IFloodlightModule
>
moduleMap
,
Set
<
IFloodlightModule
>
moduleSet
,
Collection
<
IFloodlightModule
>
moduleSet
,
IFloodlightModule
module
)
{
if
(!
moduleSet
.
contains
(
module
))
{
Collection
<
Class
<?
extends
IFloodlightService
>>
servs
=
...
...
@@ -267,11 +267,11 @@ public class FloodlightModuleLoader {
}
/**
* Allocate service implementations and then init all the modules
* Allocate
service implementations and then init all the modules
* @param moduleSet The set of modules to call their init function on
* @throws FloodlightModuleException If a module can not properly be loaded
*/
protected
void
initModules
(
Set
<
IFloodlightModule
>
moduleSet
)
protected
void
initModules
(
Collection
<
IFloodlightModule
>
moduleSet
)
throws
FloodlightModuleException
{
for
(
IFloodlightModule
module
:
moduleSet
)
{
// Get the module's service instance(s)
...
...
@@ -307,7 +307,7 @@ public class FloodlightModuleLoader {
* Call each loaded module's startup method
* @param moduleSet the module set to start up
*/
protected
void
startupModules
(
Set
<
IFloodlightModule
>
moduleSet
)
{
protected
void
startupModules
(
Collection
<
IFloodlightModule
>
moduleSet
)
{
for
(
IFloodlightModule
m
:
moduleSet
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
debug
(
"Starting "
+
...
...
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