changeset 586:9900bce6bc4c

Merge
author asaha
date Thu, 26 Jun 2014 07:53:39 -0700
parents 91986e776363 31d43d250c83
children 25327c54fb6b
files .hgtags
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 18 12:54:33 2014 -0700
+++ b/.hgtags	Thu Jun 26 07:53:39 2014 -0700
@@ -303,3 +303,4 @@
 3ff7f413379f29e1937223902edf1fe2b90d7d60 jdk8u20-b17
 a3b85d6097c52cbff3e514ad6dc4f705fbaaa8bb jdk8u20-b18
 615fdd17d4e24af63fe63a0fe85cfda3645e6826 jdk8u20-b19
+4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
--- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Wed Jun 18 12:54:33 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Thu Jun 26 07:53:39 2014 -0700
@@ -576,7 +576,8 @@
                     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");
                 }