infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-19 18:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8044762: com/sun/jdi/OptionTest.java test time out

Browse Source 
Gdata could be NULL in debugInit_exit

Reviewed-by: dcubed
This commit is contained in:
Dmitry Samersoff 2014-06-18 03:29:58 -07:00
parent b608314245
commit 97ce148fa7
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jdk/src/share/back/debugInit.c
View File

@ -1287,22 +1287,26 @@ debugInit_exit(jvmtiError error, const char *msg)
if ( error != JVMTI_ERROR_NONE ) {
exit_code = 1;
if ( docoredump ) {
LOG_MISC(("Dumping core as requested by command line"));
finish_logging(exit_code);
abort();
}
}
if ( msg==NULL ) {
msg = "";
}
LOG_MISC(("Exiting with error %s(%d): %s", jvmtiErrorText(error), error, msg));
gdata->vmDead = JNI_TRUE;
if (gdata != NULL) {
gdata->vmDead = JNI_TRUE;
/* Let's try and cleanup the JVMTI, if we even have one */
if ( gdata->jvmti != NULL ) {
/* Dispose of jvmti (gdata->jvmti becomes NULL) */
disposeEnvironment(gdata->jvmti);
/* Let's try and cleanup the JVMTI, if we even have one */
if ( gdata->jvmti != NULL ) {
/* Dispose of jvmti (gdata->jvmti becomes NULL) */
disposeEnvironment(gdata->jvmti);
}
}
/* Finish up logging. We reach here if JDWP is doing the exiting. */

3
jdk/test/ProblemList.txt
View File

@ -268,9 +268,6 @@ com/sun/jdi/RepStep.java generic-all
# 8044419
com/sun/jdi/JdbReadTwiceTest.sh generic-all
# 8046348
com/sun/jdi/OptionTest.java generic-all
############################################################################
# jdk_util