comparison src/share/vm/oops/constantPoolOop.cpp @ 1144:9b9c1ee9b3f6

Merge
author iveresov
date Wed, 06 Jan 2010 22:21:39 -0800
parents 4ce7240d622c
children c18cbe5936b8 ab102d5d923e
comparison
equal deleted inserted replaced
1129:a5a6adfca6ec 1144:9b9c1ee9b3f6
108 entry = this_oop->resolved_klass_at(which); 108 entry = this_oop->resolved_klass_at(which);
109 return (klassOop)entry; 109 return (klassOop)entry;
110 } 110 }
111 111
112 if (!PENDING_EXCEPTION-> 112 if (!PENDING_EXCEPTION->
113 is_a(SystemDictionary::linkageError_klass())) { 113 is_a(SystemDictionary::LinkageError_klass())) {
114 // Just throw the exception and don't prevent these classes from 114 // Just throw the exception and don't prevent these classes from
115 // being loaded due to virtual machine errors like StackOverflow 115 // being loaded due to virtual machine errors like StackOverflow
116 // and OutOfMemoryError, etc, or if the thread was hit by stop() 116 // and OutOfMemoryError, etc, or if the thread was hit by stop()
117 // Needs clarification to section 5.4.3 of the VM spec (see 6308271) 117 // Needs clarification to section 5.4.3 of the VM spec (see 6308271)
118 } 118 }