[vmkit-commits] [vmkit] r142837 - /vmkit/trunk/lib/J3/VMCore/Jni.cpp

[Will Dietz]

Author: wdietz2
Date: Mon Oct 24 14:26:43 2011
New Revision: 142837

URL: http://llvm.org/viewvc/llvm-project?rev=142837&view=rev
Log:
Fix JNI's Throw() method, fix return value for both Throw and ThrowNew.

(See
 http://download.oracle.com/javase/1.4.2/docs/guide/jni/spec/functions.html#wp5234)

Modified:
    vmkit/trunk/lib/J3/VMCore/Jni.cpp

Modified: vmkit/trunk/lib/J3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jni.cpp?rev=142837&r1=142836&r2=142837&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jni.cpp Mon Oct 24 14:26:43 2011
@@ -179,8 +179,11 @@
   BEGIN_JNI_EXCEPTION
   JavaThread::get()->pendingException = *(JavaObject**)obj;
 
+  RETURN_FROM_JNI(0);
+
   END_JNI_EXCEPTION
-  return 0;
+
+  RETURN_FROM_JNI(-1);
 }
 
 
@@ -211,11 +214,11 @@
   init->invokeIntSpecial(vm, realCl, res, &str);
   th->pendingException = res;
   
-  RETURN_FROM_JNI(1);
+  RETURN_FROM_JNI(0);
   
   END_JNI_EXCEPTION
 
-  RETURN_FROM_JNI(0);
+  RETURN_FROM_JNI(-1);
 }