8022655: ClassDump ignored jarStream setting

Reviewed-by: minqi, sla
This commit is contained in:
Kevin Walls 2013-08-19 14:28:58 +01:00
parent 2c28ff340a
commit a40e2a9236
2 changed files with 12 additions and 2 deletions

View File

@ -92,8 +92,13 @@ public class ClassDump extends Tool {
System.err.println("Warning: Can not create class filter!");
}
}
String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
setOutputDirectory(outputDirectory);
// outputDirectory and jarStream are alternatives: setting one closes the other.
// If neither is set, use outputDirectory from the System property:
if (outputDirectory == null && jarStream == null) {
String dirName = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
setOutputDirectory(dirName);
}
// walk through the system dictionary
SystemDictionary dict = VM.getVM().getSystemDictionary();

View File

@ -186,6 +186,11 @@ generate_replay() {
then
# enable core dump
ulimit -c unlimited
if [ $VM_OS = "solaris" ]
then
coreadm -p core $$
fi
fi
cmd="${JAVA} ${TESTVMOPTS} $@ \