lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cpoersc...@apache.org
Subject lucene-solr:master: SOLR-11740: fix stop port variable scope issue in stop_solr function (SOLR-9137 follow-on)
Date Wed, 13 Dec 2017 11:24:47 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 6771886cf -> 7974aa033


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/7974aa03
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7974aa03
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7974aa03

Branch: refs/heads/master
Commit: 7974aa033c7985b4d0dde92776b12ee50aa9ee5c
Parents: 6771886
Author: Christine Poerschke <cpoerschke@apache.org>
Authored: Wed Dec 13 11:05:49 2017 +0000
Committer: Christine Poerschke <cpoerschke@apache.org>
Committed: Wed Dec 13 11:05:49 2017 +0000

----------------------------------------------------------------------
 solr/bin/solr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7974aa03/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


Mime
View raw message