fix segfault with dynamic proxy

joeferner · joeferner · commit e1e24b059c18 · 2012-12-03T12:17:27.000-05: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
@@ -16,7 +16,13 @@ public NodeDynamicProxyClass(String path, long ptr) {
 
   public Object invoke(Object proxy, java.lang.reflect.Method m, Object[] args) throws Throwable
   {
-    return callJs(this.ptr, m, args);
+    Object result = callJs(this.ptr, m, args);
+    //if(result == null) {
+    //  System.out.println("invoke: null");
+    //} else {
+    //  System.out.println("invoke: " + result + " class: " + result.getClass() + " to string: " + result.toString());
+    //}
+    return result;
   }
 
   public void ref() {
diff --git a/src/java.cpp b/src/java.cpp
@@ -670,8 +670,10 @@ void EIO_AfterCallJs(uv_work_t* req) {
   javaResult = v8ToJava(env, v8Result);
   if(javaResult == NULL) {
     dynamicProxyData->result = NULL;
+    dynamicProxyData->resultGlobalRef = NULL;
   } else {
-    dynamicProxyData->result = env->NewGlobalRef(javaResult);
+    dynamicProxyData->result = javaResult;
+    dynamicProxyData->resultGlobalRef = env->NewGlobalRef(javaResult);
   }
 
 CleanUp:
@@ -686,6 +688,7 @@ JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jo
   dynamicProxyData->args = args;
   dynamicProxyData->done = false;
   dynamicProxyData->result = NULL;
+  dynamicProxyData->resultGlobalRef = NULL;
 
   jclass methodClazz = env->FindClass("java/lang/reflect/Method");
   jmethodID method_getName = env->GetMethodID(methodClazz, "getName", "()Ljava/lang/String;");
@@ -707,7 +710,7 @@ JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jo
     return NULL;
   }
   if(dynamicProxyData->result) {
-    env->DeleteGlobalRef(dynamicProxyData->result);
+    env->DeleteGlobalRef(dynamicProxyData->resultGlobalRef);
   }
   return dynamicProxyData->result;
 }
diff --git a/src/utils.h b/src/utils.h
@@ -34,6 +34,7 @@ struct DynamicProxyData {
   std::string methodName;
   jobjectArray args;
   jobject result;
+  jobject resultGlobalRef;
   int done;
   unsigned int markerEnd;
 };

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,13 @@ public NodeDynamicProxyClass(String path, long ptr) {`
`16`	`16`
`17`	`17`	`public Object invoke(Object proxy, java.lang.reflect.Method m, Object[] args) throws Throwable`
`18`	`18`	`{`
`19`		`- return callJs(this.ptr, m, args);`
	`19`	`+ Object result = callJs(this.ptr, m, args);`
	`20`	`+ //if(result == null) {`
	`21`	`+ // System.out.println("invoke: null");`
	`22`	`+ //} else {`
	`23`	`+ // System.out.println("invoke: " + result + " class: " + result.getClass() + " to string: " + result.toString());`
	`24`	`+ //}`
	`25`	`+ return result;`
`20`	`26`	`}`
`21`	`27`
`22`	`28`	`public void ref() {`