commit bd86bccf1b47f1151842152ee52cf5d46d6b34ab
author Brian Carlstrom <bdc@google.com> Sun Mar 10 20:26:16 2013 -0700
committer Brian Carlstrom <bdc@google.com> Mon Mar 11 15:47:02 2013 -0700
tree c0c110b47435c6e8548f1b7126f9ea20da7fd934
parent 5d021c7399fa8090910d5b47ed00465a4e0e7e0f

Tracking rebase to jb-mr1-release

Change-Id: Ic2ae1a27682cc4152003a68d59068b2c5c5eb09b

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index 0ee4c21..726c80b 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -2564,7 +2564,13 @@
     return JNI_ERR;
   }
   Runtime* runtime = Runtime::Current();
-  runtime->Start();
+  bool started = runtime->Start();
+  if (!started) {
+    delete Thread::Current()->GetJniEnv();
+    delete runtime->GetJavaVM();
+    LOG(WARNING) << "CreateJavaVM failed";
+    return JNI_ERR;
+  }
   *p_env = Thread::Current()->GetJniEnv();
   *p_vm = runtime->GetJavaVM();
   return JNI_OK;