# HG changeset patch
# User dcubed
# Date 1222955686 25200
# Node ID c005b6eac36e1288fd6ca5f59b831599b3e51c88
# Parent  af90fe21c1e37297eeb0c3621d508c63e7da6269# Parent  b7483806cc4960817546f4de8cb87bef3adb18f5
Merge

diff -r af90fe21c1e3 -r c005b6eac36e src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Wed Oct 01 16:57:40 2008 -0700
+++ b/src/share/vm/runtime/thread.cpp	Thu Oct 02 06:54:46 2008 -0700
@@ -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");