Fix #196: move endDocument() call to outside of finally-block

release-notes/VERSION

@@ -8,6 +8,8 @@ Project: woodstox
 
 #134: Increase JDK baseline to Java 8
 #194: Remove `QNameCreator` compatibility class
+#196: WstxSAXParser error handling when used with JAXB validation
+ (reported by @winfriedgerlach)
 
 6.6.0 (15-Jan-2024)
 

src/main/java/com/ctc/wstx/sax/WstxSAXParser.java

@@ -584,9 +584,8 @@ public void parse(InputSource input) throws SAXException
             mContentHandler.startDocument();
         }
 
-        /* Note: since we are reusing the same config instance, need to
-         * make sure state is not carried forward. Thus:
-         */
+        // Note: since we are reusing the same config instance, need to
+        // make sure state is not carried forward. Thus:
         cfg.resetState();
 
         try {
@@ -626,9 +625,6 @@ public void parse(InputSource input) throws SAXException
         } catch (XMLStreamException strex) {
             throwSaxException(strex);
         } finally {
-            if (mContentHandler != null) {
-                mContentHandler.endDocument();
-            }
             // Could try holding onto the buffers, too... but
             // maybe it's better to allow them to be reclaimed, if
             // needed by GC
@@ -650,6 +646,12 @@ public void parse(InputSource input) throws SAXException
                 } catch (IOException ioe) { }
             }
         }
+        // 20-Feb-2024, tatu: Was formerly done in finally-block for some
+        //    reason; but makes more sense to only be done on happy path
+        //    (as per [woodstox-core#196]
+        if (mContentHandler != null) {
+            mContentHandler.endDocument();
+        }
     }
 
     @Override