[fix] Close the FileInputStream on StaxProcessor

apache · Jun 18, 2019 · 2893d2b · 2893d2b
1 parent 9ab7795
commit 2893d2b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
@@ -40,8 +40,12 @@
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-support</artifactId>
+        </dependency>		
+        <dependency>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
+            <version>5.1.0</version>
         </dependency>
-
         <!-- test dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>

diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXProcessor.java
@@ -26,6 +26,8 @@
 import org.apache.camel.Processor;
 import org.apache.camel.support.ExchangeHelper;
 
+import com.ctc.wstx.sr.ValidatingStreamReader;
+
 /**
  * It uses SAX content handler to handle events.
  * <p/>
@@ -49,25 +51,34 @@ public StAXProcessor(ContentHandler contentHandler) {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        InputSource is = exchange.getIn().getMandatoryBody(InputSource.class);
+        XMLStreamReader stream = null;
-        XMLStreamReader stream = exchange.getIn().getMandatoryBody(XMLStreamReader.class);
+        try {
-        XMLReader reader = new StaxStreamXMLReader(stream);
+            stream = exchange.getIn().getMandatoryBody(XMLStreamReader.class);
-
+            StaxStreamXMLReader reader = new StaxStreamXMLReader(stream);
-        ContentHandler handler;
+            ContentHandler handler;
-        if (contentHandlerClass != null) {
+            if (this.contentHandlerClass != null) {
-            handler = contentHandlerClass.newInstance();
+                handler = (ContentHandler) this.contentHandlerClass.newInstance();
-        } else {
+            } else {
-            handler = contentHandler;
+                handler = this.contentHandler;
-        }
+            }
-        reader.setContentHandler(handler);
-        reader.parse(is);
 
-        if (ExchangeHelper.isOutCapable(exchange)) {
+            reader.setContentHandler(handler);
-            // preserve headers
+            // InputSource is ignored anyway
-            exchange.getOut().setHeaders(exchange.getIn().getHeaders());
+            reader.parse((InputSource) null);
-            exchange.getOut().setBody(handler);
+            if (ExchangeHelper.isOutCapable(exchange)) {
-        } else {
+                exchange.getOut().setHeaders(exchange.getIn().getHeaders());
-            exchange.getIn().setBody(handler);
+                exchange.getOut().setBody(handler);
+            } else {
+                exchange.getIn().setBody(handler);
+            }
+        } finally {
+            if (stream != null) {
+                stream.close();
+                if (stream instanceof ValidatingStreamReader) {
+                    // didn't find any method without using the woodstox package
+                    ((ValidatingStreamReader) stream).closeCompletely();
+                }
+            }
         }
     }