Move client script execution to setup(), so all of the Gateway objects

are in place before they are run.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/c2kernel/process/Gateway.java b/src/main/java/com/c2kernel/process/Gateway.java
index 5ad6e87..2ce4d26 100644
--- a/src/main/java/com/c2kernel/process/Gateway.java
+++ b/src/main/java/com/c2kernel/process/Gateway.java
@@ -115,9 +115,6 @@ public class Gateway
             Language.isTranlated=true;

             Language.mTableOfTranslation = FileStringUtility.loadLanguageFile(languageFile);

         }

-        

-        // if client, run module startup scripts. Otherwise bootstrap will do it after all imports

-        if (!AbstractMain.runningAsWrapper) mModules.runScripts("startup");

     }

 

     /**

@@ -314,6 +311,9 @@ public class Gateway
         // Init storages

         mStorage = new TransactionManager();

         mProxyManager = new EntityProxyManager();

+        

+        // if client, run module startup scripts. Otherwise bootstrap will do it after all imports

+        if (!AbstractMain.runningAsWrapper) mModules.runScripts("startup");

 

     }