Fix Locator not being fully initialized when ContentHandler.setLocato…

…r is being called (#214)
FasterXML · Nov 12, 2024 · 78062bd · 78062bd
1 parent 704a455
commit 78062bd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/main/java/com/ctc/wstx/sax/WstxSAXParser.java b/src/main/java/com/ctc/wstx/sax/WstxSAXParser.java
@@ -579,11 +579,6 @@ public void parse(InputSource input) throws SAXException
             }
         }
 
-        if (mContentHandler != null) {
-            mContentHandler.setDocumentLocator(this);
-            mContentHandler.startDocument();
-        }
-
         // Note: since we are reusing the same config instance, need to
         // make sure state is not carried forward. Thus:
         cfg.resetState();
@@ -619,6 +614,12 @@ public void parse(InputSource input) throws SAXException
             mStandalone = mScanner.standaloneSet();
             mAttrCollector = mScanner.getAttributeCollector();
             mElemStack = mScanner.getInputElementStack();
+
+            if (mContentHandler != null) {
+                mContentHandler.setDocumentLocator(this);
+                mContentHandler.startDocument();
+            }
+
             fireEvents();
         } catch (Exception e) {
             throwSaxException(e);

diff --git a/src/test/java/wstxtest/sax/TestBasicSax.java b/src/test/java/wstxtest/sax/TestBasicSax.java
@@ -23,6 +23,7 @@ public class TestBasicSax
         +"<!DOCTYPE root []>"
         +"<root><!-- comment -->"
         +"<leaf attr='a&amp;b!'>rock&apos;n <![CDATA[roll]]></leaf><?proc instr?></root>  ";
+    final static String DOCUMENT_SYSTEMID = "document.xml";
 
     public void testSimpleNs()
         throws Exception
@@ -89,8 +90,10 @@ public void doTestSimple(boolean ns, boolean useReader)
         } else {
             src = new InputSource(new ByteArrayInputStream(XML.getBytes("UTF-8")));
         }
+        src.setSystemId(DOCUMENT_SYSTEMID);
 
         sp.parse(src, h);
+        assertEquals(DOCUMENT_SYSTEMID, h._systemId);
         assertEquals(2, h._elems);
         assertEquals(1, h._attrs);
         assertEquals(11, h._charCount);
@@ -111,9 +114,19 @@ public String getText() {
     final static class MyHandler
         extends DefaultHandler
     {
-        public int _elems, _attrs;
+        public int _elems, _attrs, _charCount;
+        public String _systemId;
+        private Locator locator;
 
-        public int _charCount;
+        @Override
+        public void setDocumentLocator(Locator locator) {
+            this.locator = locator;
+        }
+
+        @Override
+        public void startDocument() throws SAXException {
+            _systemId = locator.getSystemId();
+        }
 
         @Override
         public void characters(char[] ch, int start, int length) {