Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxws

changeset 636:c31fe6ba6bac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Thu, 26 Jun 2014 08:37:17 -0700
parents 81129354f0e8 (current diff) 25327c54fb6b (diff)
children 5f78130b0a64
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 18 13:31:02 2014 -0700
+++ b/.hgtags	Thu Jun 26 08:37:17 2014 -0700
@@ -270,6 +270,7 @@
 75fd3933daaf5826e7c03bfb318026ac8a4c07ef jdk8u5-b11
 e2454d30b525bcb6ebcc711bd2928fbd29c11143 jdk8u5-b12
 d2200a87d5ad6a9d06d9df144376ea5511b3916b jdk8u5-b13
+ad56fa1dc3d375a6e909d3e005939626ba44a4b5 jdk8u5-b31
 d2732c66f0f927d7f31dead4cce1a0612b9ff2a1 jdk8u11-b01
 152cc523baf1fdfe48514e3fe0d8e5a9b3c01ba4 jdk8u11-b02
 c2c073f04f0566c868fec49b96e5885ad69f065c jdk8u11-b03
@@ -303,6 +304,7 @@
 3ff7f413379f29e1937223902edf1fe2b90d7d60 jdk8u20-b17
 a3b85d6097c52cbff3e514ad6dc4f705fbaaa8bb jdk8u20-b18
 615fdd17d4e24af63fe63a0fe85cfda3645e6826 jdk8u20-b19
+4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
 efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00
 a76779e1b0376650dfc29a1f3b14760f05e0fc6d jdk8u25-b01
 3d31955043b9f1807c9d695c7b5d604d11c132cf jdk8u25-b02
--- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Wed Jun 18 13:31:02 2014 -0700
+++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Thu Jun 26 08:37:17 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");
                 }