[lucene-solr] branch reference_impl_dev updated: @1214 Tweak xml parser.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 8ce4cb1  @1214 Tweak xml parser.
8ce4cb1 is described below

commit 8ce4cb121e80bc5d17c090d00da7db45c9c160a1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Nov 15 00:44:54 2020 -0600

    @1214 Tweak xml parser.
---
 solr/core/src/java/org/apache/solr/core/XmlConfigFile.java         | 7 +++++--
 .../src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java b/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
index 333c0b6..b3930cb 100644
--- a/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
+++ b/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
@@ -37,6 +37,7 @@ import java.util.TreeSet;
 
 import net.sf.saxon.Configuration;
 import net.sf.saxon.dom.DocumentOverNodeInfo;
+import net.sf.saxon.event.PipelineConfiguration;
 import net.sf.saxon.event.Sender;
 import net.sf.saxon.lib.ParseOptions;
 import net.sf.saxon.lib.Validation;
@@ -196,6 +197,9 @@ public class XmlConfigFile { // formerly simply "Config"
       conf2.setDocumentNumberAllocator(conf1.getDocumentNumberAllocator());
       conf2.setNamePool(conf1.getNamePool());
 
+      PipelineConfiguration plc = conf2.makePipelineConfiguration();
+      plc.setURIResolver(loader.getSysIdResolver().asURIResolver());
+
       ParseOptions parseOptions = conf2.getParseOptions();
       if (is.getSystemId() != null) {
         parseOptions.setEntityResolver(loader.getSysIdResolver());
@@ -208,7 +212,7 @@ public class XmlConfigFile { // formerly simply "Config"
       parseOptions.setSchemaValidationMode(0);
 
       TinyDocumentImpl docTree = null;
-      SolrTinyBuilder builder = new SolrTinyBuilder(conf2.makePipelineConfiguration(), substituteProps);
+      SolrTinyBuilder builder = new SolrTinyBuilder(plc, substituteProps);
       try {
         //builder.setStatistics(conf2.getTreeStatistics().SOURCE_DOCUMENT_STATISTICS);
 
@@ -217,7 +221,6 @@ public class XmlConfigFile { // formerly simply "Config"
       } finally {
         builder.close();
         builder.reset();
-        if (conf2 != null) conf2.close();
       }
 
       this.tree = docTree;
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
index 94bb965..f50ea31 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -129,7 +129,7 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
   protected volatile static String schemaString;
   protected volatile static String solrconfigString;
   protected volatile static String solrxmlString = "solr.xml";
-  protected volatile static boolean uploadSelectCollection1Config = false;
+  protected volatile static boolean uploadSelectCollection1Config = true;
   protected volatile static boolean formatZk = true;
 
   protected volatile static SortedMap<ServletHolder, String> extraServlets = Collections.emptySortedMap();