Merge remote-tracking branch 'origin/jetty-7' into jetty-8

2013-03-15 08:33:14 +11:00 · 2013-03-15 08:33:14 +11:00 · 6448758fc0
parent 1cb201ef14 cc34bdc20a
commit 6448758fc0
1 changed files with 4 additions and 0 deletions
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@ -117,6 +117,10 @@ started()
  do
    sleep 4
    [ -z "$(grep STARTED $1)" ] || return 0
+    [ -z "$(grep STOPPED $1)" ] || return 1
+    [ -z "$(grep FAILED $1)" ] || return 1
+    local PID=$(head -n 1 "$1" 2>/dev/null) || return 1
+    kill -0 "$PID" 2>/dev/null || return 1
    echo -n ". "
  done