From d922d49c12bc1a9fd3e8b62360e2138f717544f2 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 3 Nov 2010 09:25:36 +0000
Subject: [PATCH] SWS-650 - AxiomSoapMessageFactory does not provide way to set
 properties on XMLInputFactory

---
 .../soap/axiom/AxiomSoapMessageFactory.java   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
index 8960528d..f0937da3 100644
--- a/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
+++ b/core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
@@ -78,7 +78,6 @@ import org.apache.commons.logging.LogFactory;
  * @see #setPayloadCaching(boolean)
  * @since 1.0.0
  */
-@SuppressWarnings("Since15")
 public class AxiomSoapMessageFactory implements SoapMessageFactory<AxiomSoapMessage>, InitializingBean {
 
     private static final String CHARSET_PARAMETER = "charset";
@@ -89,7 +88,7 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory<AxiomSoapMess
 
     private static final Log logger = LogFactory.getLog(AxiomSoapMessageFactory.class);
 
-    private XMLInputFactory inputFactory;
+    private final XMLInputFactory inputFactory = createXmlInputFactory();
 
     private boolean payloadCaching = true;
 
@@ -104,10 +103,6 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory<AxiomSoapMess
 
     private boolean langAttributeOnSoap11FaultString = true;
 
-    /** Default constructor. */
-    public AxiomSoapMessageFactory() {
-        inputFactory = XMLInputFactory.newInstance();
-    }
 
     /**
      * Indicates whether the SOAP Body payload should be cached or not. Default is <code>true</code>.
@@ -324,6 +319,19 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory<AxiomSoapMess
         }
     }
 
+    /**
+     * Create a {@code XMLInputFactory} that this resolver will use to create {@link XMLStreamReader} objects.
+     * <p/>
+     * Can be overridden in subclasses, adding further initialization of the factory. The resulting factory is cached,
+     * so this method will only be called once.
+     *
+     * @return the created factory
+     */
+    protected XMLInputFactory createXmlInputFactory() {
+        return XMLInputFactory.newInstance();
+    }
+
+
     public String toString() {
         StringBuilder builder = new StringBuilder("AxiomSoapMessageFactory[");
         if (soapFactory instanceof SOAP11Factory) {