diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-04-23 16:32:54 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-04-23 17:21:26 -0700 |
| commit | a61894d88fabe45677f491c9f6bde30059a49026 (patch) | |
| tree | b9d8b09e5f90792867b6720a1fb4ab5c76cdfa5f /runtime/well_known_classes.cc | |
| parent | 4ceed922d44b68c3fa7cbe670014c9e2e003b92b (diff) | |
| download | art-a61894d88fabe45677f491c9f6bde30059a49026.zip art-a61894d88fabe45677f491c9f6bde30059a49026.tar.gz art-a61894d88fabe45677f491c9f6bde30059a49026.tar.bz2 | |
Fix reflection handling and test flakiness
Fixed reflection invoke to handle exceptions which occur from
FindClass or NewObject by throwing these instead of
the expected InvocationTargetException.
Added test case to 080 for this reflection invoke.
Fixed println throwing OOM in 104-growth-limit.
Change-Id: I65766e7c3478e299da06fdc3a521fe3f3e8fdba9
Diffstat (limited to 'runtime/well_known_classes.cc')
| -rw-r--r-- | runtime/well_known_classes.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index a803df8..a2d0427 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -39,6 +39,7 @@ jclass WellKnownClasses::java_lang_ClassNotFoundException; jclass WellKnownClasses::java_lang_Daemons; jclass WellKnownClasses::java_lang_Error; jclass WellKnownClasses::java_lang_Object; +jclass WellKnownClasses::java_lang_OutOfMemoryError; jclass WellKnownClasses::java_lang_reflect_AbstractMethod; jclass WellKnownClasses::java_lang_reflect_ArtMethod; jclass WellKnownClasses::java_lang_reflect_Constructor; @@ -176,6 +177,7 @@ void WellKnownClasses::Init(JNIEnv* env) { java_lang_ClassNotFoundException = CacheClass(env, "java/lang/ClassNotFoundException"); java_lang_Daemons = CacheClass(env, "java/lang/Daemons"); java_lang_Object = CacheClass(env, "java/lang/Object"); + java_lang_OutOfMemoryError = CacheClass(env, "java/lang/OutOfMemoryError"); java_lang_Error = CacheClass(env, "java/lang/Error"); java_lang_reflect_AbstractMethod = CacheClass(env, "java/lang/reflect/AbstractMethod"); java_lang_reflect_ArtMethod = CacheClass(env, "java/lang/reflect/ArtMethod"); |