Update NodeDynamicProxy.java to compare Proxy rather than InvocationHandler. Update dynamicProxy-test accordingly.

facboy · facboy · commit d1f9524299e2 · 2014-09-07T14:24:44.000+01:00
diff --git a/src-java/node/NodeDynamicProxyClass.class b/src-java/node/NodeDynamicProxyClass.class
diff --git a/src-java/node/NodeDynamicProxyClass.java b/src-java/node/NodeDynamicProxyClass.java
@@ -1,7 +1,6 @@
 package node;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 
 public class NodeDynamicProxyClass implements java.lang.reflect.InvocationHandler {
   private static final Method EQUALS;
@@ -43,9 +42,9 @@ public Object invoke(Object proxy, java.lang.reflect.Method m, Object[] args) th
       // 'this', not the 'proxy' argument, so we operate on this.
       if (EQUALS.equals(m)) {
         // need to check if the arg is a Proxy, and if so, if its invocation handler == this!
-        return Proxy.isProxyClass(args[0].getClass()) && Proxy.getInvocationHandler(args[0]) == this;
+        return args[0] == proxy;
       } else if (HASHCODE.equals(m)) {
-        return System.identityHashCode(this);
+        return System.identityHashCode(proxy);
       }
       throw e;
     }
diff --git a/test/dynamicProxy-test.js b/test/dynamicProxy-test.js
@@ -157,8 +157,10 @@ exports['Dynamic Proxy'] = nodeunit.testCase({
     var runInterface = java.newInstanceSync("RunInterface");
     var result = runInterface.runHashCodeSync(myProxy);
     var result2 = runInterface.runHashCodeSync(myProxy);
+    var systemHashCode = java.callStaticMethodSync("java.lang.System", "identityHashCode", myProxy);
 
     test.equals(result, result2);
+    test.equals(result, systemHashCode);
 
     test.done();
   },
