From 250bc9ea95d35307532332bd051e9c44191bea70 Mon Sep 17 00:00:00 2001
From: Marc Schoechlin <marc.schoechlin@breuninger.de>
Date: Sun, 4 Jan 2015 12:41:34 +0100
Subject: [PATCH] stop behavior

fix bug caused by a uncomplete change which renames the pidfile for a
running shutdown task
---
 assembly/src/release/bin/activemq | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index d746cd378f..81dbcf6aa2 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -320,7 +320,7 @@ invokeJar(){
               $ACTIVEMQ_CYGWIN \
               -jar \"${ACTIVEMQ_HOME}/bin/activemq.jar\" $COMMANDLINE_ARGS --pid $PID &
               RET=\"\$?\"; APID=\"\$!\";
-              echo \$APID > "$ACTIVEMQ_DATA/stop.pid"; exit \$RET" $DOIT_POSTFIX
+              echo \$APID > "${PIDFILE}.stop"; exit \$RET" $DOIT_POSTFIX
       RET="$?"
    else
       $EXEC_OPTION $DOIT_PREFIX "\"$JAVACMD\" $ACTIVEMQ_OPTS $ACTIVEMQ_DEBUG_OPTS \
@@ -513,7 +513,7 @@ invoke_stop(){
        exit 0
     fi
     rm -f "$ACTIVEMQ_PIDFILE" >/dev/null 2>&1
-    rm -f "$ACTIVEMQ_DATA/stop.pid" >/dev/null 2>&1
+    rm -f "${PIDFILE}.stop" >/dev/null 2>&1
     exit $RET
 }