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:01:58 UTC
lucene-solr:branch_6x: SOLR-9745: check exit code only if process has
finished
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 63aaf9183 -> 8b87a474c
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/8b87a474
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b87a474
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b87a474
Branch: refs/heads/branch_6x
Commit: 8b87a474cbf6873935975302dbd856c3cbef53ec
Parents: 63aaf91
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:01:19 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/8b87a474/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 1f11512..4a8161c 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2940,7 +2940,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 {