Fixed #257. Null check.

JumpMind · Jul 11, 2018 · 4938780 · 4938780
1 parent 1a10e1a
commit 4938780
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ract/src/main/java/org/jumpmind/metl/core/runtime/component/AbstractComponentRuntime.java b/...ract/src/main/java/org/jumpmind/metl/core/runtime/component/AbstractComponentRuntime.java
@@ -198,7 +198,9 @@ protected String resolveParamsAndHeaders(String text, Message inputMessage) {
         Map<String,String> parms = new HashMap<>(getComponentContext().getFlowParameters());
         parms.putAll(inputMessage.getHeader().getAsStrings());
         parms.put("_sequence", Long.toString(paramFlowSequence++));
-        parms.putAll(context.getFlowVariables());
+        if (context.getFlowVariables() != null) {
+            parms.putAll(context.getFlowVariables());
+        }
         return FormatUtils.replaceTokens(text, parms, true);
     }
 

diff --git a/...core/src/main/java/org/jumpmind/metl/core/runtime/component/AbstractComponentRuntime.java b/...core/src/main/java/org/jumpmind/metl/core/runtime/component/AbstractComponentRuntime.java
@@ -199,7 +199,9 @@ protected String resolveParamsAndHeaders(String text, Message inputMessage) {
         Map<String,String> parms = new HashMap<>(getComponentContext().getFlowParameters());
         parms.putAll(inputMessage.getHeader().getAsStrings());
         parms.put("_sequence", Long.toString(paramFlowSequence++));
-        parms.putAll(context.getFlowVariables());        
+        if (context.getFlowVariables() != null) {
+            parms.putAll(context.getFlowVariables());
+        }
         return FormatUtils.replaceTokens(text, parms, true);
     }