diff options
| author | hseigel <none@none> | 2013-04-29 16:13:57 -0400 |
|---|---|---|
| committer | hseigel <none@none> | 2013-04-29 16:13:57 -0400 |
| commit | 27f18fb8491f9b8b89cf0cb099d7d1fd5e00f902 (patch) | |
| tree | eaa8a77f07b612c43a6d70c301a02e5ac80b89b0 /src/share/vm/prims/whitebox.cpp | |
| parent | 386a9770f9195b532a9d9845389dd03db2ef1a4e (diff) | |
| download | jdk8u_hotspot-27f18fb8491f9b8b89cf0cb099d7d1fd5e00f902.tar.gz | |
8011773: Some tests on Interned String crashed JVM with OOM
Summary: Instead of terminating the VM, throw OutOfMemoryError exceptions.
Reviewed-by: coleenp, dholmes
Diffstat (limited to 'src/share/vm/prims/whitebox.cpp')
| -rw-r--r-- | src/share/vm/prims/whitebox.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/share/vm/prims/whitebox.cpp b/src/share/vm/prims/whitebox.cpp index 412ad4326..148bd89ee 100644 --- a/src/share/vm/prims/whitebox.cpp +++ b/src/share/vm/prims/whitebox.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -310,12 +310,8 @@ WB_END WB_ENTRY(jboolean, WB_IsInStringTable(JNIEnv* env, jobject o, jstring javaString)) ResourceMark rm(THREAD); int len; - jchar* name = java_lang_String::as_unicode_string(JNIHandles::resolve(javaString), len); - oop found_string = StringTable::the_table()->lookup(name, len); - if (found_string == NULL) { - return false; - } - return true; + jchar* name = java_lang_String::as_unicode_string(JNIHandles::resolve(javaString), len, CHECK_false); + return (StringTable::lookup(name, len) != NULL); WB_END |