You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/04 17:10:41 UTC
[47/50] lucene-solr:jira/solr-8668: SOLR-9867: rollback
SDF.createCoreContainer(). disable testTechproductsExample
SOLR-9867: rollback SDF.createCoreContainer(). disable testTechproductsExample
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1534b621
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1534b621
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1534b621
Branch: refs/heads/jira/solr-8668
Commit: 1534b6219fa99f7a64f372778e727382e256b423
Parents: 30f1422
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Thu May 4 16:19:14 2017 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Thu May 4 16:19:14 2017 +0300
----------------------------------------------------------------------
.../src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 6 +++---
.../src/test/org/apache/solr/util/TestSolrCLIRunExample.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1534b621/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index c4e0d0d..02b0460 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -247,9 +247,9 @@ public class SolrDispatchFilter extends BaseSolrFilter {
*/
protected CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
NodeConfig nodeConfig = loadNodeConfig(solrHome, extraProperties);
- CoreContainer coreContainer = new CoreContainer(nodeConfig, extraProperties, true);
- coreContainer.load();
- return coreContainer;
+ cores = new CoreContainer(nodeConfig, extraProperties, true);
+ cores.load();
+ return cores;
}
/**
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1534b621/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
index 6bce8226..86790c8 100644
--- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
+++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java
@@ -50,6 +50,7 @@ import org.apache.solr.common.SolrInputDocument;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -296,7 +297,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {
closeables = null;
}
}
-
+ @Ignore
@Test
public void testTechproductsExample() throws Exception {
testExample("techproducts");