summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMarnie McCormack <marnie@apache.org>2008-11-07 13:53:25 +0000
committerMarnie McCormack <marnie@apache.org>2008-11-07 13:53:25 +0000
commit897cdd6405ed312afb0a1649ba1c80f7011279e8 (patch)
tree515d148ae01904c6d4de3befdba6eacef933f6f0 /java
parent4b2292e58ba8127f5e4609d13f52dfcdbd140d6b (diff)
downloadqpid-python-897cdd6405ed312afb0a1649ba1c80f7011279e8.tar.gz
QPID-961 fix for attempt not set back to 0 before forcequit loop, highlighted by failure to stop on cc box
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@712126 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rwxr-xr-xjava/broker/bin/qpid.stop3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/broker/bin/qpid.stop b/java/broker/bin/qpid.stop
index 5c2d6f9421..316f8dff46 100755
--- a/java/broker/bin/qpid.stop
+++ b/java/broker/bin/qpid.stop
@@ -23,7 +23,7 @@
# Script checks for a given pid running DEFAULT_SEARCH and attempts to quit it
#
-MAX_ATTEMPTS=1
+MAX_ATTEMPTS=2
SLEEP_DELAY=1
DEFAULT_SEARCH="PNAME=QPBRKR"
@@ -136,6 +136,7 @@ if [[ $[$result] == 0 ]] ; then
echo "Process quit"
else
+ attempt=0
# Now attempt to force quit the process
while [[ $[$result] > 0 && $[$attempt] < $[$MAX_ATTEMPTS] ]] ; do
forceQuit $brokerspid