synchronous exception throwing

joeferner · joeferner · commit 0d7a4377cce3 · 2012-12-04T09:50:38.000-05:00
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -156,6 +156,10 @@ JavaObject::~JavaObject() {
 
   POP_LOCAL_JAVA_FRAME();
 
+  if(result->IsNativeError()) {
+    return ThrowException(result);
+  }
+
   return scope.Close(result);
 }
 
diff --git a/test/Test.class b/test/Test.class
diff --git a/test/Test.java b/test/Test.java
@@ -18,7 +18,7 @@ public Test() {}
   public static String staticMethod() { return "staticMethod called"; }
   public static int staticMethod(int i) { return i + 1; }
   public static void staticMethodThrows(Exception ex) throws Exception { throw ex; }
-  public static void staticMethodThrowsNew() throws Exception { throw new Exception("my exception"); }
+  public void methodThrows(Exception ex) throws Exception { throw ex; }
 
   public static int staticMethodOverload(String a) { return 1; }
   public static int staticMethodOverload(int a) { return 2; }
diff --git a/test/java-callStaticMethod-test.js b/test/java-callStaticMethod-test.js
@@ -117,9 +117,11 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     test.done();
   },
 
-  "callStaticMethodSync exception thrown from method (new exception)": function(test) {
+  "callMethodSync exception thrown from method": function(test) {
+    var ex = java.newInstanceSync("java.lang.Exception", "my exception");
+    var myTest = java.newInstanceSync("Test");
     try {
-      java.callStaticMethodSync("Test", "staticMethodThrowsNew");
+      myTest.methodThrowsSync(ex);
       test.fail("should throw");
     } catch(err) {
       test.ok(err.toString().match(/my exception/));

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,10 @@ JavaObject::~JavaObject() {`
`156`	`156`
`157`	`157`	`POP_LOCAL_JAVA_FRAME();`
`158`	`158`
	`159`	`+ if(result->IsNativeError()) {`
	`160`	`+ return ThrowException(result);`
	`161`	`+ }`
	`162`	`+`
`159`	`163`	`return scope.Close(result);`
`160`	`164`	`}`
`161`	`165`