mguay22
diff --git a/‎src/utils.cpp‎
Lines changed: 8 additions & 7 deletions b/‎src/utils.cpp‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎test/Test$SubClass.class‎
0 Bytes b/‎test/Test$SubClass.class‎
0 Bytes
diff --git a/‎test/Test$SuperClass.class‎
0 Bytes b/‎test/Test$SuperClass.class‎
0 Bytes
diff --git a/‎test/Test.class‎
232 Bytes b/‎test/Test.class‎
232 Bytes
diff --git a/‎test/Test.java‎
Lines changed: 2 additions & 0 deletions b/‎test/Test.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/java-callStaticMethod-test.js‎
Lines changed: 31 additions & 3 deletions b/‎test/java-callStaticMethod-test.js‎
Lines changed: 31 additions & 3 deletions
@@ -429,13 +429,14 @@ v8::Handle<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj) {
         jbyte result = env->CallByteMethod(obj, byte_byteValue);
         return scope.Close(v8::Number::New(result));
       }
-    case TYPE_LONG:
-      {
-        jclass longClazz = env->FindClass("java/lang/Long");
-        jmethodID long_longValue = env->GetMethodID(longClazz, "longValue", "()J");
-        jlong result = env->CallLongMethod(obj, long_longValue);
-        return scope.Close(v8::Number::New(result));
-      }
+// Removed to support long return types and long parameters.
+//    case TYPE_LONG:
+//      {
+//        jclass longClazz = env->FindClass("java/lang/Long");
+//        jmethodID long_longValue = env->GetMethodID(longClazz, "longValue", "()J");
+//        jlong result = env->CallLongMethod(obj, long_longValue);
+//        return scope.Close(v8::Number::New(result));
+//      }
     case TYPE_INT:
       {
         jclass integerClazz = env->FindClass("java/lang/Integer");
 
@@ -25,6 +25,8 @@ public Test() {}
   public static int staticMethodOverload(SuperClass a) { return a.getVal(); }
 
   public static String staticMethodCharArrayToString(char[] a) { return new String(a); }
+  public static String staticMethodLongToString(java.lang.Long l) { return l.toString(); }
+  public static long staticMethodReturnLong() { return java.lang.Long.MAX_VALUE; }
 
   public static class SuperClass {
     public int getVal() { return 3; }
 
@@ -1,4 +1,3 @@
-
 var java = require("../testHelpers").java;
 
 var nodeunit = require("nodeunit");
@@ -22,6 +21,9 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
 
   "callStaticMethod with args": function(test) {
     java.callStaticMethod("Test", "staticMethod", 42, function(err, result) {
+      if (err) {
+        return test.done(err);
+      }
       test.ok(result);
       test.equal(result, 43);
       test.done();
@@ -111,7 +113,7 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     try {
       java.callStaticMethodSync("Test", "staticMethodThrows", ex);
       test.fail("should throw");
-    } catch(err) {
+    } catch (err) {
       test.ok(err.toString().match(/my exception/));
     }
     test.done();
@@ -123,7 +125,7 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     try {
       myTest.methodThrowsSync(ex);
       test.fail("should throw");
-    } catch(err) {
+    } catch (err) {
       test.ok(err.toString().match(/my exception/));
     }
     test.done();
@@ -132,9 +134,35 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
   "char array": function(test) {
     var charArray = java.newArray("char", "hello world\n".split(''));
     java.callStaticMethod("Test", "staticMethodCharArrayToString", charArray, function(err, result) {
+      if (err) {
+        return test.done(err);
+      }
       test.ok(result);
       test.equal(result, "hello world\n");
       test.done();
     });
+  },
+
+  "java.lang.Long calls (java Long)": function(test) {
+    var javaLong = java.newInstanceSync("java.lang.Long", 5);
+    java.callStaticMethod("Test", "staticMethodLongToString", javaLong, function(err, result) {
+      if (err) {
+        return test.done(err);
+      }
+      test.ok(result);
+      test.equal(result, "5");
+      test.done();
+    });
+  },
+
+  "Call method that returns a long": function(test) {
+    java.callStaticMethod("Test", "staticMethodReturnLong", function(err, result) {
+      if (err) {
+        return test.done(err);
+      }
+      test.ok(result);
+      test.equal(result.toStringSync(), "9223372036854775807");
+      test.done();
+    });
   }
 });