fixing an ordering problem in the singleton pluginmanager

USACE · Jun 21, 2023 · fd9d6d4 · fd9d6d4
1 parent e86a224
commit fd9d6d4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/usace/cc/plugin/PluginManager.java b/src/main/java/usace/cc/plugin/PluginManager.java
@@ -14,6 +14,7 @@ public final class PluginManager {
     private Payload _payload;
     private Logger _logger;
     private static PluginManager _instance = null;
+    private boolean _hasUpdatedPaths = false;
     public static PluginManager getInstance(){
         if (_instance==null){
             _instance = new PluginManager();
@@ -45,7 +46,7 @@ private PluginManager(){
                 }
                 i ++;
             }
-            substitutePathVariables();
+            //substitutePathVariables();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -86,6 +87,10 @@ public String SubstitutePath(String path) {
         return path;
     }
     public Payload getPayload(){
+        if (!_hasUpdatedPaths){
+            substitutePathVariables();
+            _hasUpdatedPaths = true;
+        }
         return _payload;
     }
     public FileDataStore getFileStore(String storeName){