passes all nodeunit tests with node v0.10.15

joeferner · jsdevel · commit 444db95a67d8 · 2014-07-14T22:59:05.000-07:00
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "find-java-home": "0.1.1",
     "glob": "~3.2.9",
-    "nan": "^0.8.0"
+    "nan": "0.8.0"
   },
   "devDependencies": {
     "nodeunit": "~0.6.4",
diff --git a/src/java.cpp b/src/java.cpp
@@ -294,7 +294,7 @@ NAN_METHOD(Java::newInstanceSync) {
   }
 
   // run
-  v8::Handle<v8::Value> callback = v8::Undefined();
+  v8::Handle<v8::Value> callback = v8::Null();
   NewInstanceBaton* baton = new NewInstanceBaton(self, clazz, method, methodArgs, callback);
   v8::Handle<v8::Value> result = baton->runSync();
   delete baton;
@@ -349,7 +349,7 @@ NAN_METHOD(Java::newProxy) {
   }
 
   // run constructor
-  v8::Handle<v8::Value> callback = v8::Undefined();
+  v8::Handle<v8::Value> callback = v8::Null();
   NewInstanceBaton* baton = new NewInstanceBaton(self, clazz, method, methodArgs, callback);
   v8::Handle<v8::Value> result = baton->runSync();
   delete baton;
@@ -435,7 +435,7 @@ NAN_METHOD(Java::callStaticMethodSync) {
   }
 
   // run
-  v8::Handle<v8::Value> callback = v8::Undefined();
+  v8::Handle<v8::Value> callback = v8::Null();
   StaticMethodCallBaton* baton = new StaticMethodCallBaton(self, clazz, method, methodArgs, callback);
   v8::Handle<v8::Value> result = baton->runSync();
   delete baton;
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -6,10 +6,13 @@
 
 MethodCallBaton::MethodCallBaton(Java* java, jobject method, jarray args, v8::Handle<v8::Value>& callback) {
   JNIEnv *env = java->getJavaEnv();
-
   m_java = java;
   m_args = (jarray)env->NewGlobalRef(args);
-  NanAssignPersistent(v8::Value, m_callback, callback);
+  if(callback->IsFunction()) {
+    m_callback = new NanCallback(v8::Handle<v8::Function>::Cast(callback));
+  } else {
+    m_callback = new NanCallback();
+  }
   m_method = env->NewGlobalRef(method);
   m_error = NULL;
   m_result = NULL;
@@ -26,7 +29,7 @@ MethodCallBaton::~MethodCallBaton() {
   }
   env->DeleteGlobalRef(m_args);
   env->DeleteGlobalRef(m_method);
-  m_callback.Dispose();
+  delete m_callback;
 }
 
 void MethodCallBaton::run() {
@@ -64,20 +67,16 @@ v8::Handle<v8::Value> MethodCallBaton::runSync() {
 void MethodCallBaton::after(JNIEnv *env) {
   NanScope();
 
-  v8::Local<v8::Value> callback = NanPersistentToLocal(m_callback);
-  if(callback->IsFunction()) {
-    v8::Local<v8::Function> callback = v8::Local<v8::Function>::Cast(callback);
-    v8::Handle<v8::Value> result = resultsToV8(env);
-    v8::Handle<v8::Value> argv[2];
-    if(result->IsNativeError()) {
-      argv[0] = result;
-      argv[1] = v8::Undefined();
-    } else {
-      argv[0] = v8::Undefined();
-      argv[1] = result;
-    }
-    node::MakeCallback(v8::Context::GetCurrent()->Global(), callback, 2, argv);
+  v8::Handle<v8::Value> result = resultsToV8(env);
+  v8::Handle<v8::Value> argv[2];
+  if(result->IsNativeError()) {
+    argv[0] = result;
+    argv[1] = v8::Undefined();
+  } else {
+    argv[0] = v8::Undefined();
+    argv[1] = result;
   }
+  m_callback->Call(2, argv);
 }
 
 v8::Handle<v8::Value> MethodCallBaton::resultsToV8(JNIEnv *env) {
diff --git a/src/methodCallBaton.h b/src/methodCallBaton.h
@@ -32,7 +32,7 @@ class MethodCallBaton {
   v8::Handle<v8::Value> resultsToV8(JNIEnv *env);
 
   Java* m_java;
-  v8::Persistent<v8::Value> m_callback;
+  NanCallback *m_callback;
   jthrowable m_error;
   std::string m_errorString;
   jarray m_args;
diff --git a/src/utils.h b/src/utils.h
@@ -103,16 +103,16 @@ std::string methodNotFoundToString(JNIEnv *env, jclass clazz, std::string method
 
 #define ARGS_FRONT_CLASSNAME() ARGS_FRONT_STRING(className)
 
-#define ARGS_BACK_CALLBACK() \
-  bool callbackProvided;                      \
-  v8::Handle<v8::Value> callback;             \
-  if(args[args.Length()-1]->IsFunction()) {   \
-    callback = args[argsEnd-1];               \
-    argsEnd--;                                \
-    callbackProvided = true;                  \
-  } else {                                    \
-    callback = v8::Null();                    \
-    callbackProvided = false;                 \
+#define ARGS_BACK_CALLBACK()                              \
+  bool callbackProvided;                                  \
+  v8::Handle<v8::Value> callback;                         \
+  if(args[args.Length()-1]->IsFunction()) {               \
+    callback = args[argsEnd-1];                           \
+    argsEnd--;                                            \
+    callbackProvided = true;                              \
+  } else {                                                \
+    callback = v8::Null();                                \
+    callbackProvided = false;                             \
   }
 
 #define EXCEPTION_CALL_CALLBACK(JAVA, STRBUILDER) \
