diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-06-14 11:59:42 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-06-14 11:59:42 +0200 |
| commit | 6b1028ac142b4b728efb000ea7d7df0a73bdc94c (patch) | |
| tree | c59c05505f2e35c2de4507f71ea6db69b428f468 /src/main | |
| parent | 27cf0e9b66a4b57abce58e3da64f980b1305d83c (diff) | |
Move module imports into Bootstrap thread.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/c2kernel/process/Bootstrap.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/Gateway.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java index 7eacd86..99b40f3 100644 --- a/src/main/java/com/c2kernel/process/Bootstrap.java +++ b/src/main/java/com/c2kernel/process/Bootstrap.java @@ -64,6 +64,9 @@ public class Bootstrap // verify the server item's wf
initServerItemWf();
+
+ // register modules
+ Gateway.getModuleManager().registerModules();
Logger.msg("Bootstrap.run() - Bootstrapping complete");
} catch (Exception e) {
diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java index 8220a35..399a81b 100644 --- a/src/main/java/com/c2kernel/process/Gateway.java +++ b/src/main/java/com/c2kernel/process/Gateway.java @@ -161,11 +161,8 @@ public class Gateway // start corba server components
mCorbaServer = new CorbaServer();
- // start checking bootstrap items
+ // start checking bootstrap & module items
Bootstrap.run();
-
- // register modules
- mModules.registerModules();
} catch (Exception ex) {
Logger.error(ex);
|