jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 package com.sun.xml.internal.ws.encoding;
 import com.sun.istack.internal.NotNull;
 import com.sun.istack.internal.Nullable;
 import com.sun.xml.internal.ws.api.message.Attachment;
 import com.sun.xml.internal.ws.api.message.AttachmentEx;
 import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 /**
 * Parses Mime multipart message into primary part and attachment parts. It
 * parses the stream lazily as and when required.
 *
 public final class MimeMultipartParser {
 private final String start;
 private final MIMEMessage message;
 private Attachment root;
+private ContentTypeImpl contentType;
 // Attachments without root part
 private final Map<String, Attachment> attachments = new HashMap<String, Attachment>();
 private boolean gotAll;
-public MimeMultipartParser(InputStream in, String contentType, StreamingAttachmentFeature feature) {
+public MimeMultipartParser(InputStream in, String cType, StreamingAttachmentFeature feature) {
-ContentType ct = new ContentType(contentType);
+this.contentType = new ContentTypeImpl(cType);
-String boundary = ct.getParameter("boundary");
+//        ContentType ct = new ContentType(cType);
+//        String boundary = ct.getParameter("boundary");
+String boundary = contentType.getBoundary();
 if (boundary == null || boundary.equals("")) {
 throw new WebServiceException("MIME boundary parameter not found" + contentType);
 }
 message = (feature != null)
 ? new MIMEMessage(in, boundary, feature.getConfig())
 : new MIMEMessage(in, boundary);
 // Strip <...> from root part's Content-ID
-String st = ct.getParameter("start");
+//        String st = ct.getParameter("start");
+String st = contentType.getRootId();
 if (st != null && st.length() > 2 && st.charAt(0) == '<' && st.charAt(st.length()-1) == '>') {
 st = st.substring(1, st.length()-1);
 }
 start = st;
 }
 if (!gotAll) {
 MIMEPart rootPart = (start != null) ? message.getPart(start) : message.getPart(0);
 List<MIMEPart> parts = message.getAttachments();
 for(MIMEPart part : parts) {
 if (part != rootPart) {
-PartAttachment attach = new PartAttachment(part);
+String cid = part.getContentId();
-attachments.put(attach.getContentId(), attach);
+if (!attachments.containsKey(cid)) {
+PartAttachment attach = new PartAttachment(part);
+attachments.put(attach.getContentId(), attach);
+}
 }
 }
 gotAll = true;
 }
 return attachments;
 static class PartAttachment implements AttachmentEx {
 final MIMEPart part;
 byte[] buf;
+private StreamingDataHandler streamingDataHandler;
 PartAttachment(MIMEPart part) {
 this.part = part;
 }
-public @NotNull String getContentId() {
+public @NotNull @Override String getContentId() {
 return part.getContentId();
 }
-public @NotNull String getContentType() {
+public @NotNull @Override String getContentType() {
 return part.getContentType();
 }
+@Override
 public byte[] asByteArray() {
 if (buf == null) {
 ByteArrayBuffer baf = new ByteArrayBuffer();
 try {
 baf.write(part.readOnce());
 } catch(IOException ioe) {
 throw new WebServiceException(ioe);
+} finally {
+if (baf != null) {
+try {
+baf.close();
+} catch (IOException ex) {
+Logger.getLogger(MimeMultipartParser.class.getName()).log(Level.FINE, null, ex);
+}
+}
 }
 buf = baf.toByteArray();
 }
 return buf;
 }
+@Override
 public DataHandler asDataHandler() {
-return (buf != null)
+if (streamingDataHandler == null) {
-? new DataSourceStreamingDataHandler(new ByteArrayDataSource(buf,getContentType()))
+streamingDataHandler = (buf != null)
-: new MIMEPartStreamingDataHandler(part);
+? new DataSourceStreamingDataHandler(new ByteArrayDataSource(buf,getContentType()))
-}
+: new MIMEPartStreamingDataHandler(part);
+}
+return streamingDataHandler;
+}
+@Override
 public Source asSource() {
 return (buf != null)
 ? new StreamSource(new ByteArrayInputStream(buf))
 : new StreamSource(part.read());
 }
+@Override
 public InputStream asInputStream() {
 return (buf != null)
 ? new ByteArrayInputStream(buf) : part.read();
 }
+@Override
 public void writeTo(OutputStream os) throws IOException {
 if (buf != null) {
 os.write(buf);
 } else {
 InputStream in = part.read();
 }
 in.close();
 }
 }
+@Override
 public void writeTo(SOAPMessage saaj) throws SOAPException {
 saaj.createAttachmentPart().setDataHandler(asDataHandler());
 }
 // AttachmentEx methods begin here
+@Override
 public Iterator<MimeHeader> getMimeHeaders() {
 final Iterator<? extends Header> ih = part.getAllHeaders()
 .iterator();
 return new Iterator<MimeHeader>() {
+@Override
 public boolean hasNext() {
 return ih.hasNext();
 }
+@Override
 public MimeHeader next() {
 final Header hdr = ih.next();
 return new AttachmentEx.MimeHeader() {
+@Override
 public String getValue() {
 return hdr.getValue();
 }
+@Override
 public String getName() {
 return hdr.getName();
 }
 };
 }
+@Override
 public void remove() {
 throw new UnsupportedOperationException();
 }
 };
 }
 }
+public ContentTypeImpl getContentType() {
+return contentType;
+}
 }

Mercurial > jdk8-mips64-public > jaxws / file comparison

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java

src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java