method fix -- re-enables Proxy

hansonr · hansonr · commit f8c93391f294 · 2019-02-05T03:22:07.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java b/sources/net.sf.j2s.java.core/src/java/lang/reflect/Method.java
@@ -109,22 +109,21 @@ public Object invoke(Object receiver, Object... args)
 		// proxy does 
 		Object[] a = Class.getArgumentArray(parameterTypes, args, isProxy);
 		Object c = (isProxy ? receiver : this.Class_);
-		Object m = null;
+		Object m = null, val = null;
 		/** 
 		 * @j2sNative
 		 * 
 		 * if (!this.isProxy) c = c.$clazz$;
 		 * m= c[this.signature] || c.prototype && c.prototype[this.signature];
-		 * if (m != null) {
-		 *   m = this.wrap$O(m.apply(receiver,a));
-		 *  }
+		 * val = (m == null ? null : m.apply(receiver,a));
+		 * if (val != null && !this.isProxy) val = this.wrap$O(val);
 		 */
 		if (m == null) {
 		  String message = "Method " + getDeclaringClass().getName()
 				  + "." + signature + " was not found";
 		  throw new IllegalArgumentException(message); 
 		}
-		return m;
+		return val;
 	}
 
 	Object wrap(Object o) {
