Merge
authordsamersoff
Wed, 13 Apr 2016 14:19:30 +0000
changeset 37531 e83b85f957c9
parent 37529 868c7195632c (current diff)
parent 37530 059353096b4e (diff)
child 37532 1f7423e427d3
Merge
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 13 11:13:15 2016 +0200
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh	Wed Apr 13 14:19:30 2016 +0000
@@ -924,7 +924,7 @@
         # If jstack exists, so will jps
         # Show stack traces of jdb and debuggee as a possible debugging aid.
         jdbCmd=`$jdk/bin/jps -v | $grep $jdbKeyword`
-        realJdbPid=`echo "$jdbCmd" | sed -e 's@ TTY.*@@'`
+        realJdbPid=`echo "$jdbCmd" | sed -e 's@ .*@@'`
         if [ ! -z "$realJdbPid" ] ; then
             echo "-- jdb process info ----------------------" >&2
             echo "      $jdbCmd"                              >&2