commit eac766769e3114a078c188ea26776a81f0edb3cf
author Elliott Hughes <enh@google.com> Thu May 24 21:56:51 2012 -0700
committer Elliott Hughes <enh@google.com> Fri May 25 12:04:43 2012 -0700
tree 4b9b8dfc89725173431817baba4455c013e40577
parent 3f9ace8d90bfc48c8d7bf35af66de8ce8238de7f

DO NOT MERGE Fix all unsafe caching to be like libcore.

This way, if a runtime is restarted within a process, we re-initialize all
the cached data.

Conflicts:

	src/native/java_lang_Runtime.cc -- nativeExit lost an argument in dalvik-dev

(cherry picked from commit 7756d5473fa27ce7e6ac7c31770eef7030431da4)

Change-Id: I6184fc20c2a9ec16c4b053584a4d1c3b64452d0f

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index f8b40a2..8d649a6 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -17,6 +17,7 @@
 #include "runtime_support.h"
 
 #include "ScopedLocalRef.h"
+#include "well_known_classes.h"
 
 double art_l2d(int64_t l) {
   return (double) l;
@@ -609,21 +610,15 @@
 }
 
 void ThrowNewUndeclaredThrowableException(Thread* self, JNIEnv* env, Throwable* exception) {
-  ScopedLocalRef<jclass> jlr_UTE_class(env,
-      env->FindClass("java/lang/reflect/UndeclaredThrowableException"));
-  if (jlr_UTE_class.get() == NULL) {
+  jmethodID jlre_UTE_constructor = env->GetMethodID(WellKnownClasses::java_lang_reflect_UndeclaredThrowableException, "<init>",
+                                                    "(Ljava/lang/Throwable;)V");
+  jthrowable jexception = AddLocalReference<jthrowable>(env, exception);
+  ScopedLocalRef<jthrowable> jlr_UTE(env,
+      reinterpret_cast<jthrowable>(env->NewObject(WellKnownClasses::java_lang_reflect_UndeclaredThrowableException,
+      jlre_UTE_constructor, jexception)));
+  int rc = env->Throw(jlr_UTE.get());
+  if (rc != JNI_OK) {
     LOG(ERROR) << "Couldn't throw new \"java/lang/reflect/UndeclaredThrowableException\"";
-  } else {
-    jmethodID jlre_UTE_constructor = env->GetMethodID(jlr_UTE_class.get(), "<init>",
-                                                      "(Ljava/lang/Throwable;)V");
-    jthrowable jexception = AddLocalReference<jthrowable>(env, exception);
-    ScopedLocalRef<jthrowable> jlr_UTE(env,
-        reinterpret_cast<jthrowable>(env->NewObject(jlr_UTE_class.get(), jlre_UTE_constructor,
-                                                    jexception)));
-    int rc = env->Throw(jlr_UTE.get());
-    if (rc != JNI_OK) {
-      LOG(ERROR) << "Couldn't throw new \"java/lang/reflect/UndeclaredThrowableException\"";
-    }
   }
   CHECK(self->IsExceptionPending());
 }