From 57dee70f0785f1d9e0c65036afc18411dd22faa4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Mon, 4 Feb 2013 22:09:38 +0100
Subject: Move server startup script execution to the end of the item
 registration for that module.

---
 src/main/java/com/c2kernel/process/Gateway.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/Gateway.java')

diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index a75c2c9..1bb451d 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -115,8 +115,8 @@ public class Gateway
             Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile);
         }
         
-        // run module startup scripts
-        mModules.runScripts("startup");
+        // if client, run module startup scripts. Otherwise bootstrap will do it after all imports
+        if (!isServer) mModules.runScripts("startup");
     }
 
     /**
-- 
cgit v1.2.3