changeset 383:99dd4bbd9eec

Merge
author acorn
date Tue, 30 Sep 2008 12:24:27 -0400
parents e4355b352b7d (diff) 5f44674206d3 (current diff)
children b7483806cc49
files src/share/vm/runtime/thread.cpp
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Wed Sep 24 15:34:06 2008 -0400
+++ b/src/share/vm/runtime/thread.cpp	Tue Sep 30 12:24:27 2008 -0400
@@ -2985,10 +2985,6 @@
       if (UseStringCache) {
         // Forcibly initialize java/lang/String and mutate the private
         // static final "stringCacheEnabled" field before we start creating instances
-#ifdef ASSERT
-        klassOop tmp_k = SystemDictionary::find(vmSymbolHandles::java_lang_String(), Handle(), Handle(), CHECK_0);
-        assert(tmp_k == NULL, "java/lang/String should not be loaded yet");
-#endif
         klassOop k_o = SystemDictionary::resolve_or_null(vmSymbolHandles::java_lang_String(), Handle(), Handle(), CHECK_0);
         KlassHandle k = KlassHandle(THREAD, k_o);
         guarantee(k.not_null(), "Must find java/lang/String");