fix for issue #858

CenturyLinkCloud · Aug 26, 2020 · 72c234a · 72c234a
1 parent e354e29
commit 72c234a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/mdw-common/src/com/centurylink/mdw/model/variable/VariableInstance.java b/mdw-common/src/com/centurylink/mdw/model/variable/VariableInstance.java
@@ -15,6 +15,7 @@
  */
 package com.centurylink.mdw.model.variable;
 
+import com.centurylink.mdw.cache.asset.PackageCache;
 import com.centurylink.mdw.model.Jsonable;
 import com.centurylink.mdw.model.workflow.Package;
 import com.centurylink.mdw.translator.DocumentReferenceTranslator;
@@ -98,6 +99,8 @@ public String getStringValue(Package pkg) {
             return value;
         if (data == null)
             return null;
+        if (pkg == null)
+            pkg = PackageCache.getMdwBasePackage();
         value = pkg.getStringValue(type, data);
         return value;
     }
@@ -112,6 +115,8 @@ public Object getData(Package pkg) {
             return this.data;
         if (value == null)
             return null;
+        if (pkg == null)
+            pkg = PackageCache.getMdwBasePackage();
         data = pkg.getObjectValue(type, value);
         return data;
     }
@@ -127,6 +132,8 @@ public boolean isDocument(Package pkg) {
             return false;
         if (!value.startsWith("DOCUMENT:"))
             return false;
+        if (pkg == null)
+            pkg = PackageCache.getMdwBasePackage();
         return pkg.getTranslator(type) instanceof DocumentReferenceTranslator;
     }
 

diff --git a/mdw-common/src/com/centurylink/mdw/sync/SyncExpressionEvaluator.java b/mdw-common/src/com/centurylink/mdw/sync/SyncExpressionEvaluator.java
@@ -15,6 +15,7 @@
  */
 package com.centurylink.mdw.sync;
 
+import com.centurylink.mdw.cache.asset.PackageCache;
 import com.centurylink.mdw.model.variable.VariableInstance;
 import com.centurylink.mdw.model.workflow.Package;
 import com.centurylink.mdw.util.log.LoggerUtil;
@@ -60,6 +61,11 @@ public SyncExpressionEvaluator(Package pkg, String[] syncedActivityIds,
             this.syncExpression = getDefaultSyncExpression();
         else
             this.syncExpression = syncExpression;
+
+        if (pkg == null)
+            this.pkg = PackageCache.getMdwBasePackage();
+        else
+            this.pkg = pkg;
     }
 
     /**