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 05:45:15 UTC
lucene-solr:branch_6x: SOLR-9745: bring back timeout value to fix
tests
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 4f028dfb4 -> 63aaf9183
SOLR-9745: bring back timeout value to fix tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/63aaf918
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/63aaf918
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/63aaf918
Branch: refs/heads/branch_6x
Commit: 63aaf9183ce773bbaaedaf20fdae46e545eb6242
Parents: 4f028df
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue Apr 4 08:42:31 2017 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Tue Apr 4 08:44:52 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/63aaf918/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 289363b..1f11512 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2935,7 +2935,7 @@ public class SolrCLI {
// wait for execution.
try {
- handler.waitFor();
+ handler.waitFor(3000);
} catch (InterruptedException ie) {
// safe to ignore ...
Thread.interrupted();