dims 2002/07/02 07:51:30
Modified: java/src/org/apache/axis/attachments AttachmentPart.java
AttachmentsImpl.java MultiPartDimeInputStream.java
MultiPartRelatedInputStream.java
Log:
- Use set* functions (instead of add*) when setting HTTPConstants.HEADER_CONTENT_*
- cleanup removeAllAttachments.
Revision Changes Path
1.20 +8 -8
xml-axis/java/src/org/apache/axis/attachments/AttachmentPart.java
Index: AttachmentPart.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/attachments/AttachmentPart.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AttachmentPart.java 2 Jul 2002 11:31:46 -0000 1.19
+++ AttachmentPart.java 2 Jul 2002 14:51:30 -0000 1.20
@@ -96,7 +96,7 @@
* Constructor AttachmentPart
*/
public AttachmentPart() {
- addMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
SOAPUtils.getNewContentIdValue());
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
SOAPUtils.getNewContentIdValue());
}
/**
@@ -105,11 +105,11 @@
* @param dh
*/
public AttachmentPart(javax.activation.DataHandler dh) {
- addMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
SOAPUtils.getNewContentIdValue());
datahandler = dh;
if(dh != null)
- addMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE, dh.getContentType());
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE, dh.getContentType());
}
/**
@@ -137,7 +137,7 @@
* @param value
*/
public void addMimeHeader(String header, String value) {
- mimeHeaders.setHeader(header, value);
+ mimeHeaders.addHeader(header, value);
}
/**
@@ -191,7 +191,7 @@
* @param loc
*/
public void setContentLocation(String loc) {
- addMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION, loc);
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION, loc);
}
/**
@@ -204,7 +204,7 @@
if (newCid!=null && !newCid.toLowerCase().startsWith("cid:";)) {
newCid = "cid:"; + newCid;
}
- addMimeHeader(HTTPConstants.HEADER_CONTENT_ID, newCid);
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID, newCid);
}
/**
@@ -217,13 +217,13 @@
// Do not let the contentID ever be empty.
if (ret == null) {
ret = SOAPUtils.getNewContentIdValue();
- addMimeHeader(HTTPConstants.HEADER_CONTENT_ID, ret);
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID, ret);
}
ret = ret.trim();
if (ret.length() == 0) {
ret = SOAPUtils.getNewContentIdValue();
- addMimeHeader(HTTPConstants.HEADER_CONTENT_ID, ret);
+ setMimeHeader(HTTPConstants.HEADER_CONTENT_ID, ret);
}
return ret;
1.24 +5 -15
xml-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java
Index: AttachmentsImpl.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- AttachmentsImpl.java 2 Jul 2002 11:31:46 -0000 1.23
+++ AttachmentsImpl.java 2 Jul 2002 14:51:30 -0000 1.24
@@ -309,11 +309,7 @@
public void setAttachmentParts(java.util.Collection parts)
throws org.apache.axis.AxisFault {
- multipart = null;
- dimemultipart = null;
- mergeinAttachments();
- attachments.clear();
- orderedAttachments.clear();
+ removeAllAttachments();
if ((parts != null) && !parts.isEmpty()) {
for (java.util.Iterator i = parts.iterator(); i.hasNext();) {
@@ -581,19 +577,13 @@
*/
public void removeAllAttachments() {
try {
+ multipart = null;
+ dimemultipart = null;
mergeinAttachments();
+ attachments.clear();
+ orderedAttachments.clear();
} catch (AxisFault af){
log.warn(JavaUtils.getMessage("exception00"));
- }
-
- java.util.Iterator iterator = attachments.values().iterator();
- while(iterator.hasNext()){
- Part removedPart = (Part) iterator.next();
- if (removedPart != null) {
- attachments.remove(removedPart.getContentId());
- attachments.remove(removedPart.getContentLocation());
- orderedAttachments.remove(removedPart);
- }
}
}
1.6 +1 -1
xml-axis/java/src/org/apache/axis/attachments/MultiPartDimeInputStream.java
Index: MultiPartDimeInputStream.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/attachments/MultiPartDimeInputStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiPartDimeInputStream.java 2 Jul 2002 11:31:46 -0000 1.5
+++ MultiPartDimeInputStream.java 2 Jul 2002 14:51:30 -0000 1.6
@@ -202,7 +202,7 @@
AttachmentPart ap = new AttachmentPart(dh);
if (contentId != null)
- ap.addMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
contentId);
+ ap.setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
contentId);
addPart(contentId, "", ap);
1.20 +4 -4
xml-axis/java/src/org/apache/axis/attachments/MultiPartRelatedInputStream.java
Index: MultiPartRelatedInputStream.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/attachments/MultiPartRelatedInputStream.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MultiPartRelatedInputStream.java 2 Jul 2002 11:31:46 -0000 1.19
+++ MultiPartRelatedInputStream.java 2 Jul 2002 14:51:30 -0000 1.20
@@ -297,12 +297,12 @@
AttachmentPart ap = new AttachmentPart(dh);
if (contentId != null) {
- ap.addMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
+ ap.setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
contentId);
}
if (contentLocation != null) {
- ap.addMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION,
+ ap.setMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION,
contentLocation);
}
@@ -565,12 +565,12 @@
AttachmentPart ap = new AttachmentPart(dh);
if (contentId != null) {
- ap.addMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
+ ap.setMimeHeader(HTTPConstants.HEADER_CONTENT_ID,
contentId);
}
if (contentLocation != null) {
- ap.addMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION,
+ ap.setMimeHeader(HTTPConstants.HEADER_CONTENT_LOCATION,
contentLocation);
}
