You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/02/26 13:39:07 UTC
svn commit: r1662435 -
/lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
Author: shalin
Date: Thu Feb 26 12:39:07 2015
New Revision: 1662435
URL: http://svn.apache.org/r1662435
Log:
SOLR-6631: Fix bad merge
Modified:
lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java?rev=1662435&r1=1662434&r2=1662435&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java Thu Feb 26 12:39:07 2015
@@ -52,7 +52,7 @@ public class DistributedQueueTest extend
String testData = "hello world";
long timeoutMs = 500L;
- DistributedQueue dq = new DistributedQueue(zkClient, setupDistributedQueueZNode(dqZNode));
+ DistributedQueue dq = new DistributedQueue(zkClient, setupDistributedQueueZNode(dqZNode), null);
// basic ops
assertTrue(dq.poll() == null);
@@ -124,7 +124,7 @@ public class DistributedQueueTest extend
protected void setupZk() throws Exception {
System.setProperty("zkClientTimeout", "8000");
- zkServer = new ZkTestServer(createTempDir("zkData").toFile().getAbsolutePath());
+ zkServer = new ZkTestServer(createTempDir("zkData").getAbsolutePath());
zkServer.run();
System.setProperty("zkHost", zkServer.getZkAddress());
zkClient = new SolrZkClient(zkServer.getZkAddress(), AbstractZkTestCase.TIMEOUT);