(fix) trace NPE

killme2008 · Jan 10, 2019 · 5e53bcd · 5e53bcd
1 parent e583498
commit 5e53bcd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/googlecode/aviator/runtime/op/OperationRuntime.java b/src/main/java/com/googlecode/aviator/runtime/op/OperationRuntime.java
@@ -45,7 +45,7 @@ public static AviatorObject eval(Map<String, Object> env, AviatorObject[] args,
     AviatorFunction func = RuntimeUtils.getInstance(env).getOpFunction(opType);
     AviatorObject ret = eval0(env, args, opType, func);
     if (RuntimeUtils.isTracedEval(env)) {
-      trace(null, opType, ret, args);
+      trace(env, opType, ret, args);
     }
     return ret;
   }
@@ -166,7 +166,7 @@ private static void trace(Map<String, Object> env, OperatorType opType, AviatorO
       case 3:
         RuntimeUtils.printTrace(env,
             TRACE_PREFIX + args[0].desc(env) + WHITE_SPACE + "?" + WHITE_SPACE + args[0].desc(env)
-                + WHITE_SPACE + ":" + WHITE_SPACE + args[1].desc(env) + " => " + result.desc(env));
+            + WHITE_SPACE + ":" + WHITE_SPACE + args[1].desc(env) + " => " + result.desc(env));
         break;
     }
   }

diff --git a/src/main/java/com/googlecode/aviator/utils/Env.java b/src/main/java/com/googlecode/aviator/utils/Env.java
@@ -77,8 +77,10 @@ public Env() {
 
   @Override
   public Env clone() {
-    return new Env(this.mDefaults == EMPTY_ENV ? EMPTY_ENV : new HashMap<>(this.mDefaults),
+    Env ret = new Env(this.mDefaults == EMPTY_ENV ? EMPTY_ENV : new HashMap<>(this.mDefaults),
         new HashMap<>(this.mOverrides));
+    ret.instance = this.instance;
+    return ret;
   }
 
   /**
@@ -280,8 +282,8 @@ public Collection<Object> values() {
   public String toString() {
     StringBuffer buf = new StringBuffer(32 * size());
     buf.append(super.toString()).append("{"). //
-        append(Variable.INSTANCE_VAR).append("=").append(this.instance).append(", ").//
-        append(Variable.ENV_VAR).append("=").append("<this>");
+    append(Variable.INSTANCE_VAR).append("=").append(this.instance).append(", ").//
+    append(Variable.ENV_VAR).append("=").append("<this>");
 
     Iterator<String> it = keySet().iterator();
     boolean hasNext = it.hasNext();