You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/12/13 11:26:44 UTC
lucene-solr:branch_7_2: SOLR-11740: fix stop port variable scope
issue in stop_solr function (SOLR-9137 follow-on)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_2 80324cd64 -> 127ee7457
SOLR-11740: fix stop port variable scope issue in stop_solr function (SOLR-9137 follow-on)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/127ee745
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/127ee745
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/127ee745
Branch: refs/heads/branch_7_2
Commit: 127ee7457f358059ef1cb242033a14381d0a0cdf
Parents: 80324cd
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Dec 13 11:05:49 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Dec 13 11:26:16 2017 +0000
----------------------------------------------------------------------
solr/bin/solr | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/127ee745/solr/bin/solr
----------------------------------------------------------------------
diff --git a/solr/bin/solr b/solr/bin/solr
index 2fb483c..f9814c2 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -729,13 +729,13 @@ function stop_solr() {
DIR="$1"
SOLR_PORT="$2"
- STOP_PORT="${STOP_PORT:-$(expr $SOLR_PORT - 1000)}"
+ THIS_STOP_PORT="${STOP_PORT:-$(expr $SOLR_PORT - 1000)}"
STOP_KEY="$3"
SOLR_PID="$4"
if [ "$SOLR_PID" != "" ]; then
echo -e "Sending stop command to Solr running on port $SOLR_PORT ... waiting up to $SOLR_STOP_WAIT seconds to allow Jetty process $SOLR_PID to stop gracefully."
- "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
+ "$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS -jar "$DIR/start.jar" "STOP.PORT=$THIS_STOP_PORT" "STOP.KEY=$STOP_KEY" --stop || true
(loops=0
while true
do