comparison src/share/vm/runtime/signature.cpp @ 6985:80e866b1d053

Merge
author coleenp
date Fri, 16 Nov 2012 09:19:12 -0500
parents 070d523b96a7
children d13d7aba8c12
comparison
equal deleted inserted replaced
6974:6b6ddf8c4329 6985:80e866b1d053
352 FailureMode failure_mode, TRAPS) { 352 FailureMode failure_mode, TRAPS) {
353 if (!is_object()) 353 if (!is_object())
354 return Universe::java_mirror(type()); 354 return Universe::java_mirror(type());
355 Klass* klass = as_klass(class_loader, protection_domain, failure_mode, CHECK_NULL); 355 Klass* klass = as_klass(class_loader, protection_domain, failure_mode, CHECK_NULL);
356 if (klass == NULL) return NULL; 356 if (klass == NULL) return NULL;
357 return Klass::cast(klass)->java_mirror(); 357 return klass->java_mirror();
358 } 358 }
359 359
360 Symbol* SignatureStream::as_symbol_or_null() { 360 Symbol* SignatureStream::as_symbol_or_null() {
361 // Create a symbol from for string _begin _end 361 // Create a symbol from for string _begin _end
362 ResourceMark rm; 362 ResourceMark rm;