Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
8043129: JAF initialisation in SAAJ clashing with the one in javax.mail
Fri, 23 May 2014 16:25:43 +0200
- author
- mkos
- date
- Fri, 23 May 2014 16:25:43 +0200
- changeset 545
- ce46e4af2b1d
- parent 541
- 3ff7f413379f
- child 546
- 877957f3b6f0
8043129: JAF initialisation in SAAJ clashing with the one in javax.mail
Reviewed-by: chegar
| src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Wed May 28 02:27:52 2014 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Fri May 23 16:25:43 2014 +0200 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 }
