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/05/24 21:10:01 UTC
svn commit: r1745402 -
/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
Author: veithen
Date: Tue May 24 21:10:01 2016
New Revision: 1745402
URL: http://svn.apache.org/viewvc?rev=1745402&view=rev
Log:
Work around a build failure in Axis2.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java?rev=1745402&r1=1745401&r2=1745402&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/stax/MTOMXMLStreamWriterImpl.java Tue May 24 21:10:01 2016
@@ -392,7 +392,13 @@ public class MTOMXMLStreamWriterImpl ext
if (handler instanceof XOPEncodingFilterHandler) {
return ((XOPEncodingFilterHandler)handler).prepareDataHandler(dataHandler);
} else {
- return null;
+ // TODO: hack for compatibility with Axis2
+ // If we don't serialize to a MIME package, we should return null here because the
+ // DataHandler will never be serialized and the only meaningful thing to do is to
+ // base64 encode it. However, there is code in Axis2 that expects an XOP encoded
+ // message without bothering about the MIME parts referenced by the xop:Include
+ // elements...
+ return format.getNextContentId();
}
}