# HG changeset patch
# User kevinw
# Date 1376976532 25200
# Node ID 9011aa6843cecd314d2a4011b0c507eccee3c5e8
# Parent  878bb0b7e79902cfc5e70b0c61e8d7b3d2e14e3b# Parent  10c59b8021ec426a31e062911123297b41518fc1
Merge

diff -r 878bb0b7e799 -r 9011aa6843ce agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Mon Aug 19 17:29:41 2013 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java	Mon Aug 19 22:28:52 2013 -0700
@@ -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();
diff -r 878bb0b7e799 -r 9011aa6843ce test/compiler/ciReplay/common.sh
--- a/test/compiler/ciReplay/common.sh	Mon Aug 19 17:29:41 2013 -0700
+++ b/test/compiler/ciReplay/common.sh	Mon Aug 19 22:28:52 2013 -0700
@@ -186,6 +186,11 @@
     then
         # enable core dump
         ulimit -c unlimited
+
+        if [ $VM_OS = "solaris" ]
+        then
+            coreadm -p core $$
+        fi
     fi
 
     cmd="${JAVA} ${TESTVMOPTS} $@ \