You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/21 20:06:26 UTC
svn commit: r1731552 -
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java
Author: veithen
Date: Sun Feb 21 19:06:26 2016
New Revision: 1731552
URL: http://svn.apache.org/viewvc?rev=1731552&view=rev
Log:
Code simplification.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java?rev=1731552&r1=1731551&r2=1731552&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/push/sax/SAXSerializer.java Sun Feb 21 19:06:26 2016
@@ -24,7 +24,6 @@ import java.util.Stack;
import javax.activation.DataHandler;
import org.apache.axiom.core.stream.StreamException;
-import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.om.impl.common.serializer.push.SerializerImpl;
import org.apache.axiom.om.impl.intf.TextContent;
import org.apache.axiom.util.base64.Base64EncodingWriterOutputStream;
@@ -158,17 +157,7 @@ public class SAXSerializer extends Seria
if (data instanceof TextContent) {
TextContent textContent = (TextContent)data;
if (textContent.isBinary()) {
- Object dataHandlerObject = textContent.getDataHandlerObject();
- DataHandler dataHandler;
- if (dataHandlerObject instanceof DataHandlerProvider) {
- try {
- dataHandler = ((DataHandlerProvider)dataHandlerObject).getDataHandler();
- } catch (IOException ex) {
- throw new StreamException(ex);
- }
- } else {
- dataHandler = (DataHandler)dataHandlerObject;
- }
+ DataHandler dataHandler = textContent.getDataHandler();
Base64EncodingWriterOutputStream out = new Base64EncodingWriterOutputStream(new ContentHandlerWriter(contentHandler), 4096, true);
try {
dataHandler.writeTo(out);