# HG changeset patch
# User acorn
# Date 1222906503 14400
# Node ID b7483806cc4960817546f4de8cb87bef3adb18f5
# Parent  99dd4bbd9eec0e9364f13f95e3d1ce8274b71f27# Parent  ddfad9496151eb7f3dc8d9ee2a9b6e41cdfb5c81
Merge

diff -r ddfad9496151 -r b7483806cc49 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Wed Oct 01 15:05:06 2008 -0400
+++ b/src/share/vm/runtime/thread.cpp	Wed Oct 01 20:15:03 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");