int to long

joeferner · joeferner · commit 37184d069ef0 · 2012-05-31T16:41:30.000-04: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
@@ -2,10 +2,10 @@
 
 public class NodeDynamicProxyClass implements java.lang.reflect.InvocationHandler
 {
-  private native Object callJs(int ptr, java.lang.reflect.Method m, Object[] args) throws Throwable;
-  public int ptr;
+  private native Object callJs(long ptr, java.lang.reflect.Method m, Object[] args) throws Throwable;
+  public long ptr;
 
-  public NodeDynamicProxyClass(String path, int ptr) {
+  public NodeDynamicProxyClass(String path, long ptr) {
     try{
       Runtime.getRuntime().load(path);
     }catch(Exception e){
diff --git a/src/java.cpp b/src/java.cpp
@@ -635,7 +635,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
   dynamicProxyData->done = true;
 }
 
-JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jobject src, jint ptr, jobject method, jobjectArray args) {
+JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jobject src, jlong ptr, jobject method, jobjectArray args) {
   long myThreadId = my_getThreadId();
 
   DynamicProxyData* dynamicProxyData = (DynamicProxyData*)ptr;
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -65,8 +65,8 @@ JavaObject::~JavaObject() {
 
   jclass nodeDynamicProxyClass = env->FindClass("node/NodeDynamicProxyClass");
   if(env->IsInstanceOf(m_obj, nodeDynamicProxyClass)) {
-    jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "I");
-    DynamicProxyData* proxyData = (DynamicProxyData*)(int)env->GetIntField(m_obj, ptrField);
+    jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "J");
+    DynamicProxyData* proxyData = (DynamicProxyData*)(int)env->GetLongField(m_obj, ptrField);
     delete proxyData;
   }
 
diff --git a/src/node_NodeDynamicProxyClass.h b/src/node_NodeDynamicProxyClass.h
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -206,8 +206,8 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {
       jclass nodeDynamicProxyClass = env->FindClass("node/NodeDynamicProxyClass");
 
       if(env->IsInstanceOf(jobj, nodeDynamicProxyClass)) {
-        jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "I");
-        DynamicProxyData* proxyData = (DynamicProxyData*)(int)env->GetIntField(jobj, ptrField);
+        jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "J");
+        DynamicProxyData* proxyData = (DynamicProxyData*)(long)env->GetLongField(jobj, ptrField);
 
         jclass dynamicInterface = javaFindClass(env, proxyData->interfaceName);
         if(dynamicInterface == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ void EIO_AfterCallJs(uv_work_t* req) {`
`635`	`635`	`dynamicProxyData->done = true;`
`636`	`636`	`}`
`637`	`637`
`638`		`-JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jobject src, jint ptr, jobject method, jobjectArray args) {`
	`638`	`+JNIEXPORT jobject JNICALL Java_node_NodeDynamicProxyClass_callJs(JNIEnv *env, jobject src, jlong ptr, jobject method, jobjectArray args) {`
`639`	`639`	`long myThreadId = my_getThreadId();`
`640`	`640`
`641`	`641`	`DynamicProxyData* dynamicProxyData = (DynamicProxyData*)ptr;`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ JavaObject::~JavaObject() {`
`65`	`65`
`66`	`66`	`jclass nodeDynamicProxyClass = env->FindClass("node/NodeDynamicProxyClass");`
`67`	`67`	`if(env->IsInstanceOf(m_obj, nodeDynamicProxyClass)) {`
`68`		`- jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "I");`
`69`		`- DynamicProxyData* proxyData = (DynamicProxyData*)(int)env->GetIntField(m_obj, ptrField);`
	`68`	`+ jfieldID ptrField = env->GetFieldID(nodeDynamicProxyClass, "ptr", "J");`
	`69`	`+ DynamicProxyData* proxyData = (DynamicProxyData*)(int)env->GetLongField(m_obj, ptrField);`
`70`	`70`	`delete proxyData;`
`71`	`71`	`}`
`72`	`72`