Mercurial > hg > icedtea7-forest-aarch64 > jaxws
changeset 1080:08b1ec082a66
Merge
| author | asaha |
|---|---|
| date | Thu, 28 Aug 2014 15:04:43 -0700 |
| parents | ace21763f956 (diff) 21ba67b58642 (current diff) |
| children | bff6f57f0823 |
| files | .hgtags |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 25 15:58:15 2014 -0700 +++ b/.hgtags Thu Aug 28 15:04:43 2014 -0700 @@ -511,3 +511,6 @@ f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09 615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10 b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11 +bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 +0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 +579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02
--- a/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Mon Aug 25 15:58:15 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java Thu Aug 28 15:04:43 2014 -0700 @@ -571,7 +571,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"); }