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 2017/02/01 22:32:56 UTC
svn commit: r1781327 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java
axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java
Author: veithen
Date: Wed Feb 1 22:32:55 2017
New Revision: 1781327
URL: http://svn.apache.org/viewvc?rev=1781327&view=rev
Log:
Make the MIMEMessage API more uniform.
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java?rev=1781327&r1=1781326&r2=1781327&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderSpec.java Wed Feb 1 22:32:55 2017
@@ -202,7 +202,8 @@ final class BuilderSpec {
new XOPDecodingFilter(new OMAttachmentAccessor() {
@Override
public DataHandler getDataHandler(String contentID) {
- return message.getDataHandler(contentID);
+ Part part = message.getPart(contentID);
+ return part == null ? null : part.getDataHandler();
}
})),
new Detachable() {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java?rev=1781327&r1=1781326&r2=1781327&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java Wed Feb 1 22:32:55 2017
@@ -27,8 +27,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
-
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.blob.WritableBlobFactory;
import org.apache.commons.logging.Log;
@@ -195,11 +193,19 @@ public final class MIMEMessage implement
return contentType;
}
- public DataHandler getDataHandler(String contentID) {
+ /**
+ * Get the MIME part with the given content ID.
+ *
+ * @param contentID
+ * the content ID of the part to retrieve
+ * @return the MIME part, or {@code null} if the message doesn't have a part with the given
+ * content ID
+ */
+ public Part getPart(String contentID) {
do {
PartImpl part = partMap.get(contentID);
if (part != null) {
- return part.getDataHandler();
+ return part;
}
} while (getNextPart() != null);
return null;