fix optimized public fields accessor and varargs method invocation

cubita-io · Jan 22, 2013 · 7bf9dbb · 7bf9dbb
1 parent 3e44509
commit 7bf9dbb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/main/java/org/mvel2/optimizers/impl/refl/nodes/DynamicFieldAccessor.java b/src/main/java/org/mvel2/optimizers/impl/refl/nodes/DynamicFieldAccessor.java
@@ -34,7 +34,7 @@ public DynamicFieldAccessor() {
   }
 
   public DynamicFieldAccessor(Field field) {
-    this.field = field;
+    setField(field);
   }
 
   public Object getValue(Object ctx, Object elCtx, VariableResolverFactory vars) {

diff --git a/src/main/java/org/mvel2/optimizers/impl/refl/nodes/MethodAccessor.java b/src/main/java/org/mvel2/optimizers/impl/refl/nodes/MethodAccessor.java
@@ -146,7 +146,7 @@ private Object[] executeAll(Object ctx, VariableResolverFactory vars, Method m)
           vals[length - 1] = lastParam.getClass().isArray() ? lastParam : new Object[] {lastParam};
       } else {
         Object[] vararg = new Object[parms.length - length + 1];
-        for (int i = 0; i < vararg.length; i++) vararg[i] = parms[parms.length - length + i].getValue(ctx, vars);
+        for (int i = 0; i < vararg.length; i++) vararg[i] = parms[length - 1 + i].getValue(ctx, vars);
         vals[length - 1] = vararg;
       }
     }
@@ -192,9 +192,7 @@ public MethodAccessor() {
   }
 
   public MethodAccessor(Method method, ExecutableStatement[] parms) {
-    this.method = method;
-    this.length = (this.parameterTypes = this.method.getParameterTypes()).length;
-
+    setMethod(method);
     this.parms = parms;
   }