Mercurial > hg > graal-compiler
changeset 12065:10c59b8021ec
8022655: ClassDump ignored jarStream setting
Reviewed-by: minqi, sla
author | kevinw |
---|---|
date | Mon, 19 Aug 2013 14:28:58 +0100 |
parents | e5003079dfa5 |
children | 9011aa6843ce |
files | agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java test/compiler/ciReplay/common.sh |
diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Fri Aug 16 10:06:58 2013 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java Mon Aug 19 14:28:58 2013 +0100 @@ -92,8 +92,13 @@ 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();
--- a/test/compiler/ciReplay/common.sh Fri Aug 16 10:06:58 2013 -0700 +++ b/test/compiler/ciReplay/common.sh Mon Aug 19 14:28:58 2013 +0100 @@ -186,6 +186,11 @@ then # enable core dump ulimit -c unlimited + + if [ $VM_OS = "solaris" ] + then + coreadm -p core $$ + fi fi cmd="${JAVA} ${TESTVMOPTS} $@ \