diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-09-15 08:13:21 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-09-15 08:13:21 +0000 |
| commit | 3cf100216bc1e9c7207a3c963d984665d7a5b9a1 (patch) | |
| tree | 9fa570c54e48e843a9ac6e30bbeda2fcebf6b1ec /java/broker | |
| parent | 683a5677a37def4ed3c564fbebfe8951bcf86142 (diff) | |
| download | qpid-python-3cf100216bc1e9c7207a3c963d984665d7a5b9a1.tar.gz | |
Reveted changes to QPID-2099, QPID-2100. The value of PNAME must not be changed.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@815206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rwxr-xr-x | java/broker/bin/qpid.stop | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/java/broker/bin/qpid.stop b/java/broker/bin/qpid.stop index 2a5caac8d4..316f8dff46 100755 --- a/java/broker/bin/qpid.stop +++ b/java/broker/bin/qpid.stop @@ -25,20 +25,12 @@ MAX_ATTEMPTS=2 SLEEP_DELAY=1 -DEFAULT_SEARCH="\-DPNAME=\"" +DEFAULT_SEARCH="PNAME=QPBRKR" -# -# Use QPID_PNAME to set search criteria. -# - If not set default back to attempting QPID_STOP_SEARCH -# -if [ -z "$QPID_PNAME" ]; then - if [ -z "$QPID_STOP_SEARCH" ]; then - SEARCH=$DEFAULT_SEARCH; - else - SEARCH=$DEFAULT_SEARCH$QPID_STOP_SEARCH; - fi +if [ -z "$QPID_STOP_SEARCH" ]; then + SEARCH=$DEFAULT_SEARCH; else - SEARCH=$DEFAULT_SEARCH$QPID_PNAME; + SEARCH=$QPID_STOP_SEARCH; fi # |