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/04/28 22:57:14 UTC
svn commit: r1741515 -
/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
Author: veithen
Date: Thu Apr 28 20:57:13 2016
New Revision: 1741515
URL: http://svn.apache.org/viewvc?rev=1741515&view=rev
Log:
Code simplification.
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java?rev=1741515&r1=1741514&r2=1741515&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java Thu Apr 28 20:57:13 2016
@@ -276,12 +276,9 @@ class MIMEMessage {
throw new OMException(ex);
}
- if (partContentID == null & attachmentsMap.isEmpty()) {
- String id = "firstPart_" + UIDGenerator.generateContentId();
- firstPartId = id;
- DataHandler dataHandler = currentPart.getDataHandler();
- attachmentsMap.put(id, dataHandler);
- return dataHandler;
+ if (partContentID == null) {
+ // We only get here if isRootPart is true
+ partContentID = "firstPart_" + UIDGenerator.generateContentId();
}
if (attachmentsMap.isEmpty()) {
firstPartId = partContentID;