Mercurial > jdk8-mips64-public > jaxws / changeset

changeset

Merge jdk8u20-b20

Thu, 19 Jun 2014 17:59:35 -0700

author
lana
date
Thu, 19 Jun 2014 17:59:35 -0700
changeset 547
4681b10c0c31
parent 544
f5e8ff3323e7
parent 546
877957f3b6f0
child 548
31d43d250c83

Merge

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Wed Jun 18 12:34:40 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java	Thu Jun 19 17:59:35 2014 -0700
     1.3 @@ -576,7 +576,8 @@
     1.4                      mailMap.addMailcap("text/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
     1.5                      mailMap.addMailcap("application/xml;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.XmlDataContentHandler");
     1.6                      mailMap.addMailcap("application/fastinfoset;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.FastInfosetDataContentHandler");
     1.7 -                    mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");
     1.8 +                    // this handler seems to be not used according VCS history ...
     1.9 +                    // mailMap.addMailcap("multipart/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.MultipartDataContentHandler");
    1.10                      mailMap.addMailcap("image/*;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.ImageDataContentHandler");
    1.11                      mailMap.addMailcap("text/plain;;x-java-content-handler=com.sun.xml.internal.messaging.saaj.soap.StringDataContentHandler");
    1.12                  }

Mercurial Repository: jdk8-mips64-public/jaxws

mercurial