commit 5cb5ad27944efb08d4556b3c0d362302e37e832b
author Elliott Hughes <enh@google.com> Sun Oct 02 12:13:39 2011 -0700
committer Elliott Hughes <enh@google.com> Sun Oct 02 12:13:39 2011 -0700
tree 63334f19072ca2ba7179973f0ce62101ee89605d
parent d6fe38d96b6116bd53cf2cb14734af8d69e08661

Fix exception throwing to support no detail message.

(The empty string as a detail message is distinct from a NULL detail message,
and is treated differently by Throwable.printStackTrace.)

Change-Id: I8c65deac9f18c5782dcf6e72e4c37e6dd4174fe9

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 144ec22..bc1de52 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -253,7 +253,7 @@
 
 void ThrowNoSuchMethodError(ScopedJniThreadState& ts, Class* c, const char* name, const char* sig, const char* kind) {
   std::string class_descriptor(c->GetDescriptor()->ToModifiedUtf8());
-  ts.Self()->ThrowNewException("Ljava/lang/NoSuchMethodError;",
+  ts.Self()->ThrowNewExceptionF("Ljava/lang/NoSuchMethodError;",
       "no %s method \"%s.%s%s\"", kind, class_descriptor.c_str(), name, sig);
 }
 
@@ -306,7 +306,7 @@
     DCHECK(ts.Self()->IsExceptionPending());
     ts.Self()->ClearException();
     std::string class_descriptor(c->GetDescriptor()->ToModifiedUtf8());
-    ts.Self()->ThrowNewException("Ljava/lang/NoSuchFieldError;",
+    ts.Self()->ThrowNewExceptionF("Ljava/lang/NoSuchFieldError;",
         "no type \"%s\" found and so no field \"%s\" could be found in class "
         "\"%s\" or its superclasses", sig, name, class_descriptor.c_str());
     return NULL;
@@ -318,7 +318,7 @@
   }
   if (field == NULL) {
     std::string class_descriptor(c->GetDescriptor()->ToModifiedUtf8());
-    ts.Self()->ThrowNewException("Ljava/lang/NoSuchFieldError;",
+    ts.Self()->ThrowNewExceptionF("Ljava/lang/NoSuchFieldError;",
         "no \"%s\" field \"%s\" in class \"%s\" or its superclasses", sig,
         name, class_descriptor.c_str());
     return NULL;
@@ -366,12 +366,12 @@
 
 void ThrowAIOOBE(ScopedJniThreadState& ts, Array* array, jsize start, jsize length, const char* identifier) {
   std::string type(PrettyTypeOf(array));
-  ts.Self()->ThrowNewException("Ljava/lang/ArrayIndexOutOfBoundsException;",
+  ts.Self()->ThrowNewExceptionF("Ljava/lang/ArrayIndexOutOfBoundsException;",
       "%s offset=%d length=%d %s.length=%d",
       type.c_str(), start, length, identifier, array->GetLength());
 }
 void ThrowSIOOBE(ScopedJniThreadState& ts, jsize start, jsize length, jsize array_length) {
-  ts.Self()->ThrowNewException("Ljava/lang/StringIndexOutOfBoundsException;",
+  ts.Self()->ThrowNewExceptionF("Ljava/lang/StringIndexOutOfBoundsException;",
       "offset=%d length=%d string.length()=%d", start, length, array_length);
 }
 
@@ -697,7 +697,7 @@
       return JNI_ERR;
     }
     ScopedLocalRef<jstring> s(env, env->NewStringUTF(msg));
-    if (s.get() == NULL) {
+    if (msg != NULL && s.get() == NULL) {
       return JNI_ERR;
     }
 
@@ -708,8 +708,6 @@
       return JNI_ERR;
     }
 
-    LOG(INFO) << "Throwing " << PrettyTypeOf(Decode<Throwable*>(ts, exception.get()))
-              << ": " << msg;
     ts.Self()->SetException(Decode<Throwable*>(ts, exception.get()));
 
     return JNI_OK;
@@ -2824,7 +2822,7 @@
   }
   // throwing can cause libraries_lock to be reacquired
   if (native_method == NULL) {
-    Thread::Current()->ThrowNewException("Ljava/lang/UnsatisfiedLinkError;", "%s", detail.c_str());
+    Thread::Current()->ThrowNewException("Ljava/lang/UnsatisfiedLinkError;", detail.c_str());
   }
   return native_method;
 }