Thu, 26 Jun 2014 07:53:39 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Wed Jun 18 12:54:33 2014 -0700 1.2 +++ b/.hgtags Thu Jun 26 07:53:39 2014 -0700 1.3 @@ -303,3 +303,4 @@ 1.4 3ff7f413379f29e1937223902edf1fe2b90d7d60 jdk8u20-b17 1.5 a3b85d6097c52cbff3e514ad6dc4f705fbaaa8bb jdk8u20-b18 1.6 615fdd17d4e24af63fe63a0fe85cfda3645e6826 jdk8u20-b19 1.7 +4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
2.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Wed Jun 18 12:54:33 2014 -0700 2.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Thu Jun 26 07:53:39 2014 -0700 2.3 @@ -576,7 +576,8 @@ 2.4 mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler"); 2.5 mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler"); 2.6 mailMap.addMailcap("application/fastinfoset;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler"); 2.7 - mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler"); 2.8 + // this handler seems to be not used according VCS history ... 2.9 + // mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler"); 2.10 mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler"); 2.11 mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler"); 2.12 }