You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2016/12/31 19:48:19 UTC

lucene-solr:branch_6x: SOLR-9880 Fix concurrency bugs in tests.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x a7bb14b6c -> 250036e29


SOLR-9880 Fix concurrency bugs in 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/250036e2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/250036e2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/250036e2

Branch: refs/heads/branch_6x
Commit: 250036e29d21d1e86a8484dc84be51111caa40b8
Parents: a7bb14b
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Sat Dec 31 20:46:32 2016 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Sat Dec 31 20:47:52 2016 +0100

----------------------------------------------------------------------
 .../apache/solr/metrics/reporters/SolrGangliaReporterTest.java    | 3 ++-
 .../apache/solr/metrics/reporters/SolrGraphiteReporterTest.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250036e2/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
index b5b0f85..d9675ef 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGangliaReporterTest.java
@@ -73,7 +73,8 @@ public class SolrGangliaReporterTest extends SolrTestCaseJ4 {
     gangliaReporter.start();
     Thread.sleep(5000);
     assertTrue(names.size() >= 3);
-    for (String name : names) {
+    String[] frozenNames = (String[])names.toArray(new String[names.size()]);
+    for (String name : frozenNames) {
       assertTrue(name, name.startsWith("test.solr.node.cores."));
     }
   }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/250036e2/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
index 6773e0c..3d1c482 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/SolrGraphiteReporterTest.java
@@ -69,7 +69,8 @@ public class SolrGraphiteReporterTest extends SolrTestCaseJ4 {
       assertTrue(reporter instanceof SolrGraphiteReporter);
       Thread.sleep(5000);
       assertTrue(mock.lines.size() >= 3);
-      for (String line : mock.lines) {
+      String[] frozenLines = (String[])mock.lines.toArray(new String[mock.lines.size()]);
+      for (String line : frozenLines) {
         assertTrue(line, line.startsWith("test.solr.node.cores."));
       }
     } finally {