From 1534b6219fa99f7a64f372778e727382e256b423 Mon Sep 17 00:00:00 2001
From: Mikhail Khludnev <mkhl@apache.org>
Date: Thu, 4 May 2017 16:19:14 +0300
Subject: [PATCH] SOLR-9867: rollback SDF.createCoreContainer(). disable
 testTechproductsExample

---
 .../java/org/apache/solr/servlet/SolrDispatchFilter.java    | 6 +++---
 .../test/org/apache/solr/util/TestSolrCLIRunExample.java    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

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 c4e0d0d37d1..02b046051d8 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;
   }
 
   /**
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 6bce8226f0c..86790c877da 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");