Merge
authordcubed
Thu, 02 Oct 2008 06:54:46 -0700
changeset 1417 22bac34084fb
parent 1411 e97ccaa63428 (current diff)
parent 1416 82d735b435dc (diff)
child 1418 e8fcbe2c4203
Merge
--- a/hotspot/src/share/vm/runtime/thread.cpp	Wed Oct 01 16:57:40 2008 -0700
+++ b/hotspot/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");