You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/08/21 01:31:11 UTC
[44/50] [abbrv] lucene-solr:jira/http2: SOLR-12679:
MiniSolrCloudCluster.startJettySolrRunner method should not add a duplicate
jetty instance to the list
SOLR-12679: MiniSolrCloudCluster.startJettySolrRunner method should not add a duplicate jetty instance to the list
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3c9050c3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3c9050c3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3c9050c3
Branch: refs/heads/jira/http2
Commit: 3c9050c3dd3f4ceda3dad612307e0589cf2e12ab
Parents: 20d0f67
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Mon Aug 20 14:24:31 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Mon Aug 20 14:24:31 2018 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
.../src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3c9050c3/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c80958b..963f1ba 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -247,7 +247,7 @@ Bug Fixes
* SOLR-12674: RollupStream should not use the HashQueryParser for 1 worker. (Varun Thacker)
-* SOLR-12679: MiniSolrCloudCluster.stopJettySolrRunner should remove jetty from the internal list. (shalin)
+* SOLR-12679: MiniSolrCloudCluster internal jetty list should never have duplicates (shalin)
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3c9050c3/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 8b442db..f49870f 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -423,7 +423,7 @@ public class MiniSolrCloudCluster {
*/
public JettySolrRunner startJettySolrRunner(JettySolrRunner jetty) throws Exception {
jetty.start(false);
- jettys.add(jetty);
+ if (!jettys.contains(jetty)) jettys.add(jetty);
return jetty;
}