0005812: MathColumnTransform uses Evaluator that is not thread-safe

JumpMind · Apr 27, 2023 · 23ec255 · 23ec255
1 parent 5769814
commit 23ec255
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/MathColumnTransform.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/MathColumnTransform.java
@@ -32,7 +32,7 @@
 
 public class MathColumnTransform implements ISingleNewAndOldValueColumnTransform, IBuiltInExtensionPoint {
     public final static String NAME = "math";
-    private static Evaluator eval = new Evaluator();
+    public final static String EVALUATOR = "evalutor";
 
     public String getName() {
         return NAME;
@@ -52,6 +52,11 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             String newValue, String oldValue) throws IgnoreColumnException, IgnoreRowException {
         String transformExpression = column.getTransformExpression();
         try {
+            Evaluator eval = (Evaluator) context.get(EVALUATOR);
+            if (eval == null) {
+                eval = new Evaluator();
+                context.put(EVALUATOR, eval);
+            }
             eval.clearVariables();
             eval.putVariable("currentValue", newValue);
             eval.putVariable("oldValue", oldValue);