aboutsummaryrefslogtreecommitdiff
path: root/src/share/jaxws_classes
diff options
context:
space:
mode:
authormkos <none@none>2014-05-23 16:25:43 +0200
committermkos <none@none>2014-05-23 16:25:43 +0200
commit40e7d303efd0c8ad17c94b7b614ffee764f56387 (patch)
treea171f193a8606a51427f33f1dfae94ef727138d1 /src/share/jaxws_classes
parent0a2d815b2d5155b3c9fc3cfd16f67836576f01ab (diff)
downloadjdk8u_jaxws-40e7d303efd0c8ad17c94b7b614ffee764f56387.tar.gz
8043129: JAF initialisation in SAAJ clashing with the one in javax.mail
Reviewed-by: chegar
Diffstat (limited to 'src/share/jaxws_classes')
-rw-r--r--src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
index dbaeafe3..5ea9c02b 100644
--- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
+++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java
@@ -576,7 +576,8 @@ public class AttachmentPartImpl extends AttachmentPart {
mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
mailMap.addMailcap("application/fastinfoset;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler");
- mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");
+ // this handler seems to be not used according VCS history ...
+ // mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");
mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler");
mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler");
}