comparison src/share/vm/prims/jvm.cpp @ 23007:3c8b53552a43

4505697: nsk/jdi/ExceptionEvent/_itself_/exevent006 and exevent008 tests fail with InvocationTargetException Reviewed-by: dcubed, dholmes, sspitsyn
author jbachorik
date Mon, 24 Feb 2014 10:28:22 +0100
parents d4caf9c96afd
children dd9cc155639c 0cdf9eb633c4 0a78f55d49fa
comparison
equal deleted inserted replaced
22997:ade5be2b1758 23007:3c8b53552a43
1370 } 1370 }
1371 1371
1372 if (HAS_PENDING_EXCEPTION) { 1372 if (HAS_PENDING_EXCEPTION) {
1373 pending_exception = Handle(THREAD, PENDING_EXCEPTION); 1373 pending_exception = Handle(THREAD, PENDING_EXCEPTION);
1374 CLEAR_PENDING_EXCEPTION; 1374 CLEAR_PENDING_EXCEPTION;
1375 1375 // JVMTI has already reported the pending exception
1376 // JVMTI internal flag reset is needed in order to report PrivilegedActionException
1377 if (THREAD->is_Java_thread()) {
1378 JvmtiExport::clear_detected_exception((JavaThread*) THREAD);
1379 }
1376 if ( pending_exception->is_a(SystemDictionary::Exception_klass()) && 1380 if ( pending_exception->is_a(SystemDictionary::Exception_klass()) &&
1377 !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) { 1381 !pending_exception->is_a(SystemDictionary::RuntimeException_klass())) {
1378 // Throw a java.security.PrivilegedActionException(Exception e) exception 1382 // Throw a java.security.PrivilegedActionException(Exception e) exception
1379 JavaCallArguments args(pending_exception); 1383 JavaCallArguments args(pending_exception);
1380 THROW_ARG_0(vmSymbols::java_security_PrivilegedActionException(), 1384 THROW_ARG_0(vmSymbols::java_security_PrivilegedActionException(),