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:43:37 UTC

lucene-solr:master: SOLR-9745: bring back timeout value to fix tests

Repository: lucene-solr
Updated Branches:
  refs/heads/master 0bf7a5ff3 -> 3f172a019


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

Branch: refs/heads/master
Commit: 3f172a019b21c0dafaa7a18e0ccd0e99b1c5f3bd
Parents: 0bf7a5f
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:42:31 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/3f172a01/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 da7e63e..3572ea4 100644
--- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java
@@ -2934,7 +2934,7 @@ public class SolrCLI {
 
         // wait for execution.
         try {
-          handler.waitFor();
+          handler.waitFor(3000);
         } catch (InterruptedException ie) {
           // safe to ignore ...
           Thread.interrupted();