commit 75fe90cdb6e358a09047468b750648c8a3bfac9f
author Brian Carlstrom <bdc@google.com> Wed Jun 26 22:26:16 2013 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jun 27 00:10:34 2013 -0700
tree 3c2872c22550ca36e158297e080debc7bfecd425
parent f3b3bf13247364eb111cd20493a236e8f3ce2164

Improve exception detail with JNI_OnLoad issues

Change-Id: I83c679d0b282f8d9ceb717acf20dda3af2124c66

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 7c19025..2673074 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -2870,7 +2870,8 @@
     self->SetClassLoaderOverride(old_class_loader);
 
     if (IsBadJniVersion(version)) {
-      LOG(ERROR) << "Bad JNI version returned from JNI_OnLoad in \"" << path << "\": " << version;
+      StringAppendF(&detail, "Bad JNI version returned from JNI_OnLoad in \"%s\": %d",
+                    path.c_str(), version);
       // It's unwise to call dlclose() here, but we can mark it
       // as bad and ensure that future load attempts will fail.
       // We don't know how far JNI_OnLoad got, so there could
@@ -2878,10 +2879,9 @@
       // newly-registered native method calls.  We could try to
       // unregister them, but that doesn't seem worthwhile.
       result = false;
-    } else {
-      VLOG(jni) << "[Returned " << (result ? "successfully" : "failure")
-                << " from JNI_OnLoad in \"" << path << "\"]";
     }
+    VLOG(jni) << "[Returned " << (result ? "successfully" : "failure")
+              << " from JNI_OnLoad in \"" << path << "\"]";
   }
 
   library->SetResult(result);