From 9904db48ceaabbf412b8f57bb9629e28a1abcac8 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Wed, 12 Nov 2014 17:01:52 +1100
Subject: [PATCH] 450894 jetty.sh does not delete JETTY_STATE at start

---
 jetty-distribution/src/main/resources/bin/jetty.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/jetty-distribution/src/main/resources/bin/jetty.sh b/jetty-distribution/src/main/resources/bin/jetty.sh
index 1f995f68b73..dec038b3863 100755
--- a/jetty-distribution/src/main/resources/bin/jetty.sh
+++ b/jetty-distribution/src/main/resources/bin/jetty.sh
@@ -285,7 +285,6 @@ esac
 
 
 JETTY_ARGS=("$JETTY_ARGS" "jetty.state=$JETTY_STATE")
-rm -f $JETTY_STATE
 
 ##################################################
 # Get the list of config.xml files from jetty.conf
@@ -495,9 +494,6 @@ case "$ACTION" in
 
         sleep 1
       done
-
-      rm -f "$JETTY_PID"
-      echo OK
     else
       if [ ! -f "$JETTY_PID" ] ; then
         echo "ERROR: no pid found at $JETTY_PID"
@@ -519,11 +515,12 @@ case "$ACTION" in
 
         sleep 1
       done
-
-      rm -f "$JETTY_PID"
-      echo OK
     fi
 
+    rm -f "$JETTY_PID"
+    rm -f "$JETTY_STATE"
+    echo OK
+
     ;;
 
   restart)
@@ -571,6 +568,7 @@ case "$ACTION" in
     echo "JETTY_PID      =  $JETTY_PID"
     echo "JETTY_START    =  $JETTY_START"
     echo "JETTY_LOGS     =  $JETTY_LOGS"
+    echo "JETTY_STATE    =  $JETTY_STATE"
     echo "CLASSPATH      =  $CLASSPATH"
     echo "JAVA           =  $JAVA"
     echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"