Merge remote-tracking branch 'remotes/asf/lucene_solr_4_10' into heli…

…o_4_10
Heliosearch · Dec 5, 2014 · a7bec3d · a7bec3d
2 parents ec96bee + a463d48
commit a7bec3d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/solr/bin/solr b/solr/bin/solr
@@ -740,8 +740,10 @@ else
   if [ "$SOLR_PID" != "" ]; then
     stop_solr "$SOLR_SERVER_DIR" "$SOLR_PORT" "$STOP_KEY" "$SOLR_PID"
   else
-    echo -e "No process found for Solr node running on port $SOLR_PORT"
-    exit 1
+    if [ "$SCRIPT_CMD" == "stop" ]; then
+      echo -e "No process found for Solr node running on port $SOLR_PORT"
+      exit 1
+    fi
   fi
 fi