You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/02/14 10:15:04 UTC
svn commit: r1730301 - in /axis/axis2/java/core/branches/1_7: ./
modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
Author: veithen
Date: Sun Feb 14 09:15:03 2016
New Revision: 1730301
URL: http://svn.apache.org/viewvc?rev=1730301&view=rev
Log:
Merge r1730300 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 09:15:03 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730186,1730195,1730197,1730222,1730300
Modified: axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java?rev=1730301&r1=1730300&r2=1730301&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java Sun Feb 14 09:15:03 2016
@@ -44,7 +44,6 @@ import org.apache.commons.logging.LogFac
import javax.activation.DataSource;
import javax.mail.util.ByteArrayDataSource;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -151,11 +150,7 @@ public class DataSourceBlockImpl extends
throws XMLStreamException, WebServiceException {
try {
if (busObj instanceof DataSource) {
- XMLInputFactory f = StAXUtils.getXMLInputFactory();
-
- XMLStreamReader reader = f.createXMLStreamReader(((DataSource)busObj).getInputStream());
- StAXUtils.releaseXMLInputFactory(f);
- return reader;
+ return StAXUtils.createXMLStreamReader(((DataSource)busObj).getInputStream());
}
throw ExceptionFactory.makeWebServiceException(
Messages.getMessage("SourceNotSupported", busObject.getClass().getName()));
Modified: axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java?rev=1730301&r1=1730300&r2=1730301&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java Sun Feb 14 09:15:03 2016
@@ -227,9 +227,7 @@ public class SourceBlockImpl extends Blo
if (busObj instanceof StreamSource) {
XMLInputFactory f = StAXUtils.getXMLInputFactory();
- XMLStreamReader reader = f.createXMLStreamReader((Source)busObj);
- StAXUtils.releaseXMLInputFactory(f);
- return reader;
+ return f.createXMLStreamReader((Source)busObj);
}
//TODO: For GM we need to only use this approach when absolutely necessary.
// For example, we don't want to do this if this is a (1.6) StaxSource or if the