jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java

-:8c0b6bccfe47
+:0989ad8c0860
 /*
-* Copyright (c) 1997, 2011, 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
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 } else {
 urlEndpointClass = Class.forName(JAXM_URLENDPOINT);
 }
 } catch (ClassNotFoundException ex) {
 //Do nothing. URLEndpoint is available only when JAXM is there.
-log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM");
+if (log.isLoggable(Level.FINEST))
+log.finest("SAAJ0090.p2p.endpoint.available.only.for.JAXM");
 }
 if (urlEndpointClass != null) {
 if (urlEndpointClass.isInstance(endPoint)) {
 String url = null;
 log.severe("SAAJ0007.p2p.bad.endPoint.type");
 throw new SOAPExceptionImpl("Bad endPoint type " + endPoint);
 }
 }
-SOAPMessage post(SOAPMessage message, URL endPoint) throws SOAPException {
+SOAPMessage post(SOAPMessage message, URL endPoint) throws SOAPException, IOException {
 boolean isFailure = false;
 URL url = null;
 HttpURLConnection httpConnection = null;
 try {
 if (endPoint.getProtocol().equals("https"))
 //if(!setHttps)
 initHttps();
 // Process the URL
-JaxmURI uri = new JaxmURI(endPoint.toString());
+URI uri = new URI(endPoint.toString());
-String userInfo = uri.getUserinfo();
+String userInfo = uri.getRawUserInfo();
 url = endPoint;
 if (dL > 0)
 d("uri: " + userInfo + " " + url + " " + uri);
 concat.toString());
 }
 if ("Authorization".equals(header.getName())) {
 hasAuth = true;
-log.fine("SAAJ0091.p2p.https.auth.in.POST.true");
+if (log.isLoggable(Level.FINE))
+log.fine("SAAJ0091.p2p.https.auth.in.POST.true");
 }
 }
 if (!hasAuth && userInfo != null) {
 initAuthUserInfo(httpConnection, userInfo);
 }
 OutputStream out = httpConnection.getOutputStream();
-message.writeTo(out);
+try {
+message.writeTo(out);
 out.flush();
-out.close();
+} finally {
+out.close();
+}
 httpConnection.connect();
 try {
 log.severe("SAAJ0009.p2p.msg.send.failed");
 throw new SOAPExceptionImpl("Message send failed", ex);
 }
 SOAPMessage response = null;
+InputStream httpIn = null;
 if (responseCode == HttpURLConnection.HTTP_OK || isFailure) {
 try {
 MimeHeaders headers = new MimeHeaders();
 String key, value;
 headers.addHeader(key, values.nextToken().trim());
 }
 i++;
 }
-InputStream httpIn =
+httpIn =
 (isFailure
 ? httpConnection.getErrorStream()
 : httpConnection.getInputStream());
 byte[] bytes = readFully(httpIn);
 } else {
 ByteInputStream in = new ByteInputStream(bytes, length);
 response = messageFactory.createMessage(headers, in);
 }
-httpIn.close();
-httpConnection.disconnect();
 } catch (SOAPException ex) {
 throw ex;
 } catch (Exception ex) {
 log.log(Level.SEVERE,"SAAJ0010.p2p.cannot.read.resp", ex);
 throw new SOAPExceptionImpl(
 "Unable to read response: " + ex.getMessage());
+} finally {
+if (httpIn != null)
+httpIn.close();
+httpConnection.disconnect();
 }
 }
 return response;
 }
 throw new SOAPExceptionImpl(ex);
 } else
 throw new SOAPExceptionImpl("Bad endPoint type " + endPoint);
 }
-SOAPMessage doGet(URL endPoint) throws SOAPException {
+SOAPMessage doGet(URL endPoint) throws SOAPException, IOException {
 boolean isFailure = false;
 URL url = null;
 HttpURLConnection httpConnection = null;
 try {
 /// Is https GET allowed??
 if (endPoint.getProtocol().equals("https"))
 initHttps();
 // Process the URL
-JaxmURI uri = new JaxmURI(endPoint.toString());
+URI uri = new URI(endPoint.toString());
-String userInfo = uri.getUserinfo();
+String userInfo = uri.getRawUserInfo();
 url = endPoint;
 if (dL > 0)
 d("uri: " + userInfo + " " + url + " " + uri);
 log.severe("SAAJ0012.p2p.get.failed");
 throw new SOAPExceptionImpl("Get failed", ex);
 }
 SOAPMessage response = null;
+InputStream httpIn = null;
 if (responseCode == HttpURLConnection.HTTP_OK || isFailure) {
 try {
 MimeHeaders headers = new MimeHeaders();
 String key, value;
 headers.addHeader(key, values.nextToken().trim());
 }
 i++;
 }
-InputStream httpIn =
+httpIn =
 (isFailure
 ? httpConnection.getErrorStream()
 : httpConnection.getInputStream());
 // If no reply message is returned,
 // content-Length header field value is expected to be zero.
 log.warning("SAAJ0014.p2p.content.zero");
 } else {
 response = messageFactory.createMessage(headers, httpIn);
 }
-httpIn.close();
-httpConnection.disconnect();
 } catch (SOAPException ex) {
 throw ex;
 } catch (Exception ex) {
 log.log(Level.SEVERE,
 "SAAJ0010.p2p.cannot.read.resp",
 ex);
 throw new SOAPExceptionImpl(
 "Unable to read response: " + ex.getMessage());
+} finally {
+if (httpIn != null)
+httpIn.close();
+httpConnection.disconnect();
 }
 }
 return response;
 }
 }
 private void initHttps() {
 //if(!setHttps) {
 String pkgs = SAAJUtil.getSystemProperty("java.protocol.handler.pkgs");
-log.log(Level.FINE,
+if (log.isLoggable(Level.FINE))
-"SAAJ0053.p2p.providers",
+log.log(Level.FINE, "SAAJ0053.p2p.providers", new String[] { pkgs });
-new String[] { pkgs });
 if (pkgs == null || pkgs.indexOf(SSL_PKG) < 0) {
 if (pkgs == null)
 pkgs = SSL_PKG;
 else
 pkgs = pkgs + "|" + SSL_PKG;
 System.setProperty("java.protocol.handler.pkgs", pkgs);
-log.log(Level.FINE,
+if (log.isLoggable(Level.FINE))
-"SAAJ0054.p2p.set.providers",
+log.log(Level.FINE, "SAAJ0054.p2p.set.providers",
 new String[] { pkgs });
 try {
 Class c = Class.forName(SSL_PROVIDER);
 Provider p = (Provider) c.newInstance();
 Security.addProvider(p);
-log.log(Level.FINE,
+if (log.isLoggable(Level.FINE))
-"SAAJ0055.p2p.added.ssl.provider",
+log.log(Level.FINE, "SAAJ0055.p2p.added.ssl.provider",
 new String[] { SSL_PROVIDER });
 //System.out.println("Added SSL_PROVIDER " + SSL_PROVIDER);
 //setHttps = true;
 } catch (Exception ex) {
 }
 }

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java

src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java