You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/03/18 18:31:51 UTC
svn commit: r1578975 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/core/CoreContainer.java
test/org/apache/solr/cloud/ZkControllerTest.java
Author: markrmiller
Date: Tue Mar 18 17:31:51 2014
New Revision: 1578975
URL: http://svn.apache.org/r1578975
Log:
SOLR-5832: Improve scary logging from ZkControllerTest suggests test setup isn't doing what it's suppose to.
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1578975&r1=1578974&r2=1578975&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Tue Mar 18 17:31:51 2014
@@ -86,7 +86,7 @@ public class CoreContainer {
protected boolean shareSchema;
protected ZkContainer zkSys = new ZkContainer();
- private ShardHandlerFactory shardHandlerFactory;
+ protected ShardHandlerFactory shardHandlerFactory;
private UpdateShardHandler updateShardHandler;
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1578975&r1=1578974&r2=1578975&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Tue Mar 18 17:31:51 2014
@@ -30,6 +30,7 @@ import org.apache.solr.common.cloud.ZkNo
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
+import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.handler.component.HttpShardHandlerFactory;
import org.apache.solr.handler.component.ShardHandlerFactory;
import org.apache.solr.util.ExternalPaths;
@@ -308,11 +309,11 @@ public class ZkControllerTest extends So
}
private static class MockCoreContainer extends CoreContainer {
- private HttpShardHandlerFactory shardHandlerFactory;
public MockCoreContainer() {
super((Object)null);
this.shardHandlerFactory = new HttpShardHandlerFactory();
+ this.coreAdminHandler = new CoreAdminHandler();
}
@Override
@@ -322,10 +323,6 @@ public class ZkControllerTest extends So
public String getAdminPath() {
return "/admin/cores";
}
-
- @Override
- public ShardHandlerFactory getShardHandlerFactory() {
- return shardHandlerFactory;
- }
+
}
}