better java scoping

joeferner · joeferner · commit 3760c6bb638a · 2012-12-10T10:17:52.000-05:00
diff --git a/binding.gyp b/binding.gyp
@@ -28,7 +28,8 @@
               {
                 'action_name': 'verifyDeps',
                 'inputs': [
-                  '$(JAVA_HOME)/lib/jvm.lib'
+                  '$(JAVA_HOME)/lib/jvm.lib',
+                  '$(JAVA_HOME)/include/jni.h'
                 ],
                 'outputs': ['./build/depsVerified'],
                 'action': [],
@@ -49,7 +50,8 @@
               {
                 'action_name': 'verifyDeps',
                 'inputs': [
-                  '$(JAVA_HOME)jre/lib/<(arch)/server/libjvm.so'
+                  '$(JAVA_HOME)jre/lib/<(arch)/server/libjvm.so',
+                  '$(JAVA_HOME)/include/jni.h'
                 ],
                 'outputs': ['./build/depsVerified'],
                 'action': [],
diff --git a/src/java.cpp b/src/java.cpp
@@ -165,6 +165,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   jclass classClazz = env->FindClass("java/lang/ClassLoader");
   jmethodID class_getClassLoader = env->GetStaticMethodID(classClazz, "getSystemClassLoader", "()Ljava/lang/ClassLoader;");
@@ -182,6 +183,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -221,6 +223,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -263,6 +266,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -318,6 +322,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -358,6 +363,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -401,6 +407,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -430,6 +437,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   int argsStart = 0;
   int argsEnd = args.Length();
@@ -498,6 +506,7 @@ v8::Handle<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
     return ensureJvmResults;
   }
   JNIEnv* env = self->getJavaEnv();
+  JavaScope javaScope(env);
 
   if(args.Length() != 1) {
     return ThrowException(v8::Exception::TypeError(v8::String::New("newByte only takes 1 argument")));
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -2,6 +2,7 @@
 #include "methodCallBaton.h"
 #include "java.h"
 #include "javaObject.h"
+#include "javaScope.h"
 
 MethodCallBaton::MethodCallBaton(Java* java, jobject method, jarray args, v8::Handle<v8::Value>& callback) {
   JNIEnv *env = java->getJavaEnv();
@@ -41,7 +42,11 @@ v8::Handle<v8::Value> MethodCallBaton::runSync() {
 /*static*/ void MethodCallBaton::EIO_MethodCall(uv_work_t* req) {
   MethodCallBaton* self = static_cast<MethodCallBaton*>(req->data);
   JNIEnv *env = javaAttachCurrentThread(self->m_java->getJvm(), self->m_java->getClassLoader());
-  self->execute(env);
+  // scope the java scope to after/before attaching to thread.
+  {
+    JavaScope javaScope(env);
+    self->execute(env);
+  }
   javaDetachCurrentThread(self->m_java->getJvm());
 }
 
