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 21:40:16 UTC
svn commit: r1741499 -
/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
Author: veithen
Date: Thu Apr 28 19:40:16 2016
New Revision: 1741499
URL: http://svn.apache.org/viewvc?rev=1741499&view=rev
Log:
Eliminate partIndex.
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=1741499&r1=1741498&r2=1741499&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 19:40:16 2016
@@ -71,9 +71,6 @@ class MIMEMessage {
*/
private final Map<String,DataHandler> attachmentsMap = new LinkedHashMap<String,DataHandler>();
- /** <code>partIndex</code>- Number of Mime parts parsed */
- private int partIndex = 0;
-
/**
* The MIME part currently being processed.
*/
@@ -169,7 +166,7 @@ class MIMEMessage {
// to handle the Start parameter not mentioned situation
if (rootContentID == null) {
- if (partIndex == 0) {
+ if (attachmentsMap.isEmpty()) {
getNextPartDataHandler();
}
rootContentID = firstPartId;
@@ -254,7 +251,7 @@ class MIMEMessage {
} else {
Part nextPart = getPart();
String partContentID = nextPart.getContentID();
- if (partContentID == null & partIndex == 1) {
+ if (partContentID == null & attachmentsMap.isEmpty()) {
String id = "firstPart_" + UIDGenerator.generateContentId();
firstPartId = id;
DataHandler dataHandler = nextPart.getDataHandler();
@@ -271,7 +268,7 @@ class MIMEMessage {
.length() - 1));
}
- if (partIndex == 1) {
+ if (attachmentsMap.isEmpty()) {
firstPartId = partContentID;
}
if (attachmentsMap.containsKey(partContentID)) {
@@ -296,12 +293,11 @@ class MIMEMessage {
partsRequested = true;
- boolean isRootPart = (partIndex == 0);
+ boolean isRootPart = attachmentsMap.isEmpty();
try {
List<Header> headers = readHeaders();
- partIndex++;
currentPart = new PartImpl(isRootPart ? rootPartBlobFactory : attachmentBlobFactory, headers, parser);
return currentPart;
} catch (IOException ex) {