You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2017/04/04 08:08:05 UTC
lucene-solr:master: SOLR-9745: check exit code only if process has
finished
Repository: lucene-solr
Updated Branches:
refs/heads/master 23b002a0f -> 4c737b8df
SOLR-9745: check exit code only if process has finished
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4c737b8d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4c737b8d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4c737b8d
Branch: refs/heads/master
Commit: 4c737b8df9b130cf530d17271576730e21d5b4cc
Parents: 23b002a
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue Apr 4 11:01:19 2017 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Tue Apr 4 11:02:59 2017 +0300
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/util/SolrCLI.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4c737b8d/solr/core/src/java/org/apache/solr/util/SolrCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
index 3572ea4..7be76af 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2939,7 +2939,7 @@ public class SolrCLI {
// safe to ignore ...
Thread.interrupted();
}
- if (handler.getExitValue() != 0) {
+ if (handler.hasResult() && handler.getExitValue() != 0) {
throw new Exception("Failed to start Solr using command: "+startCmd+" Exception : "+handler.getException());
}
} else {