diff -r 8c0b6bccfe47 -r 0989ad8c0860 src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java --- a/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java Thu Apr 04 19:05:24 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java Tue Apr 09 14:51:13 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, 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 @@ -31,6 +31,7 @@ import java.net.URLDecoder; import java.nio.ByteBuffer; import java.util.*; +import java.util.logging.Level; import java.util.logging.Logger; /** @@ -104,7 +105,7 @@ * @return attachemnt part */ public MIMEPart getPart(int index) { - LOGGER.fine("index="+index); + LOGGER.log(Level.FINE, "index={0}", index); MIMEPart part = (index < partsList.size()) ? partsList.get(index) : null; if (parsed && part == null) { throw new MIMEParsingException("There is no "+index+" attachment part "); @@ -114,7 +115,7 @@ part = new MIMEPart(this); partsList.add(index, part); } - LOGGER.fine("Got attachment at index="+index+" attachment="+part); + LOGGER.log(Level.FINE, "Got attachment at index={0} attachment={1}", new Object[]{index, part}); return part; } @@ -128,7 +129,7 @@ * @return attachemnt part */ public MIMEPart getPart(String contentId) { - LOGGER.fine("Content-ID="+contentId); + LOGGER.log(Level.FINE, "Content-ID={0}", contentId); MIMEPart part = getDecodedCidPart(contentId); if (parsed && part == null) { throw new MIMEParsingException("There is no attachment part with Content-ID = "+contentId); @@ -138,7 +139,7 @@ part = new MIMEPart(this, contentId); partsMap.put(contentId, part); } - LOGGER.fine("Got attachment for Content-ID="+contentId+" attachment="+part); + LOGGER.log(Level.FINE, "Got attachment for Content-ID={0} attachment={1}", new Object[]{contentId, part}); return part; } @@ -162,7 +163,7 @@ /** * Parses the whole MIME message eagerly */ - public void parseAll() { + public final void parseAll() { while(makeProgress()) { // Nothing to do } @@ -184,15 +185,15 @@ switch(event.getEventType()) { case START_MESSAGE : - LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_MESSAGE); + LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_MESSAGE); break; case START_PART : - LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.START_PART); + LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.START_PART); break; case HEADERS : - LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.HEADERS); + LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.HEADERS); MIMEEvent.Headers headers = (MIMEEvent.Headers)event; InternetHeaders ih = headers.getHeaders(); List cids = ih.getHeader("content-id"); @@ -219,20 +220,20 @@ break; case CONTENT : - LOGGER.finer("MIMEEvent="+MIMEEvent.EVENT_TYPE.CONTENT); + LOGGER.log(Level.FINER, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.CONTENT); MIMEEvent.Content content = (MIMEEvent.Content)event; ByteBuffer buf = content.getData(); currentPart.addBody(buf); break; case END_PART : - LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_PART); + LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_PART); currentPart.doneParsing(); ++currentIndex; break; case END_MESSAGE : - LOGGER.fine("MIMEEvent="+MIMEEvent.EVENT_TYPE.END_MESSAGE); + LOGGER.log(Level.FINE, "MIMEEvent={0}", MIMEEvent.EVENT_TYPE.END_MESSAGE); parsed = true; try { in.close();