changeset 14539:47b775458982

Merged
author Christian Wirth <christian.wirth@oracle.com>
date Fri, 14 Mar 2014 09:58:31 +0100
parents 5454f6bf50bf (diff) 4c9f24b8f002 (current diff)
children f659d019d3ab
files agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphCache.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/spi/GraphCache.java mxtool/mx.py src/os/bsd/dtrace/hotspot.d src/os/bsd/dtrace/hotspot_jni.d src/os/bsd/dtrace/hs_private.d src/os/solaris/dtrace/hotspot.d src/os/solaris/dtrace/hotspot_jni.d src/os/solaris/dtrace/hs_private.d src/share/vm/utilities/dtrace_usdt2_disabled.hpp
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Thu Mar 13 13:38:02 2014 -0700
+++ b/mxtool/mx.py	Fri Mar 14 09:58:31 2014 +0100
@@ -1099,6 +1099,8 @@
     return run(java().format_cmd(args, addDefaultArgs), nonZeroIsFatal=nonZeroIsFatal, out=out, err=err, cwd=cwd)
 
 def _kill_process_group(pid, sig):
+    if not sig:
+        sig = signal.SIGKILL
     pgid = os.getpgid(pid)
     try:
         os.killpg(pgid, sig)