commit bec2bcf7fbffa9a92fde743b660b43e1024330dd
author Michael Glavassevich <mrglavas@apache.org> Mon Dec 07 20:17:23 2015 +0000
committer Michael Glavassevich <mrglavas@apache.org> Mon Dec 07 20:17:23 2015 +0000
tree 62683012ceadc64f4aa4f5542ba28d5d8251091e
parent 1cc69e831aabd77be7bb647b455ef9a2b7f765ee

Fixing a defect. If the parser is reading an XML 1.1 document, the InternalEntityMonitor was not getting wired into the XML 1.1 pipeline.

git-svn-id: https://svn.apache.org/repos/asf/xerces/java/trunk@1718451 13f79535-47bb-0310-9956-ffa450edef68

src/org/apache/xerces/parsers/SecureProcessingConfiguration.java

diff --git a/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java b/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
index 1de8a27..cf908bb 100644
--- a/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
+++ b/src/org/apache/xerces/parsers/SecureProcessingConfiguration.java
@@ -30,6 +30,7 @@
 import org.apache.xerces.impl.Constants;
 import org.apache.xerces.impl.XMLEntityDescription;
 import org.apache.xerces.impl.XMLErrorReporter;
+import org.apache.xerces.impl.dtd.XMLDTDProcessor;
 import org.apache.xerces.impl.msg.XMLMessageFormatter;
 import org.apache.xerces.util.SecurityManager;
 import org.apache.xerces.util.SymbolTable;
@@ -43,6 +44,7 @@
 import org.apache.xerces.xni.parser.XMLComponentManager;
 import org.apache.xerces.xni.parser.XMLConfigurationException;
 import org.apache.xerces.xni.parser.XMLDTDFilter;
+import org.apache.xerces.xni.parser.XMLDTDScanner;
 import org.apache.xerces.xni.parser.XMLDTDSource;
 import org.apache.xerces.xni.parser.XMLEntityResolver;
 import org.apache.xerces.xni.parser.XMLInputSource;
@@ -274,26 +276,36 @@
     /** Configures the XML 1.0 pipeline. */
     protected void configurePipeline() {
         super.configurePipeline();
-        configurePipelineCommon();
+        configurePipelineCommon(true);
     }
     
     /** Configures the XML 1.1 pipeline. */
     protected void configureXML11Pipeline() {
         super.configureXML11Pipeline();
-        configurePipelineCommon();
+        configurePipelineCommon(false);
     }
     
-    private void configurePipelineCommon() {
+    private void configurePipelineCommon(boolean isXML10) {
         if (fSecurityManager != null) {
             fTotalEntitySize = 0;
             if (fInternalEntityMonitor == null) {
                 fInternalEntityMonitor = new InternalEntityMonitor();
             }
             // Reconfigure DTD pipeline. Insert internal entity decl monitor.
-            fDTDScanner.setDTDHandler(fInternalEntityMonitor);
-            fInternalEntityMonitor.setDTDSource(fDTDScanner);
-            fInternalEntityMonitor.setDTDHandler(fDTDProcessor);
-            fDTDProcessor.setDTDSource(fInternalEntityMonitor);
+            final XMLDTDScanner dtdScanner;
+            final XMLDTDProcessor dtdProcessor;
+            if (isXML10) {
+                dtdScanner = fDTDScanner;
+                dtdProcessor = fDTDProcessor;
+            }
+            else {
+                dtdScanner = fXML11DTDScanner;
+                dtdProcessor = fXML11DTDProcessor;
+            }
+            dtdScanner.setDTDHandler(fInternalEntityMonitor);
+            fInternalEntityMonitor.setDTDSource(dtdScanner);
+            fInternalEntityMonitor.setDTDHandler(dtdProcessor);
+            dtdProcessor.setDTDSource(fInternalEntityMonitor);
         }
     }