jdk8-mips64-public/jaxws: comparison src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.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
 import com.sun.xml.internal.ws.api.WSBinding;
 import com.sun.xml.internal.ws.api.ha.StickyFeature;
 import com.sun.xml.internal.ws.api.message.Packet;
 import com.sun.xml.internal.ws.api.pipe.*;
 import com.sun.xml.internal.ws.api.pipe.helper.AbstractTubeImpl;
+import com.sun.xml.internal.ws.client.ClientTransportException;
 import com.sun.xml.internal.ws.developer.HttpConfigFeature;
+import com.sun.xml.internal.ws.resources.ClientMessages;
 import com.sun.xml.internal.ws.transport.Headers;
 import com.sun.xml.internal.ws.util.ByteArrayBuffer;
-import com.sun.xml.internal.ws.client.ClientTransportException;
-import com.sun.xml.internal.ws.resources.ClientMessages;
 import com.sun.xml.internal.ws.util.RuntimeVersion;
 import com.sun.xml.internal.ws.util.StreamUtils;
 import javax.xml.bind.DatatypeConverter;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.handler.MessageContext;
 import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.handler.MessageContext;
+import java.io.*;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
 import java.net.CookieHandler;
-import java.util.Collections;
+import java.net.HttpURLConnection;
-import java.util.List;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.net.HttpURLConnection;
 /**
 * {@link Tube} that sends a request to a remote HTTP server.
 *
 * TODO: need to create separate HTTP transport pipes for binding. SOAP1.1, SOAP1.2,
 * TODO: XML/HTTP differ in handling status codes.
 *
 * @author Jitendra Kotamraju
 */
 public class HttpTransportPipe extends AbstractTubeImpl {
-private static final Logger LOGGER = Logger.getLogger(HttpTransportPipe.class.getName());
+private static final List<String> USER_AGENT = Collections.singletonList(RuntimeVersion.VERSION.toString());
+private static final Logger LOGGER = Logger.getLogger(HttpTransportPipe.class.getName());
+/**
+* Dumps what goes across HTTP transport.
+*/
+public static boolean dump;
 private final Codec codec;
 private final WSBinding binding;
-private static final List<String> USER_AGENT = Collections.singletonList(RuntimeVersion.VERSION.toString());
 private final CookieHandler cookieJar;      // shared object among the tubes
 private final boolean sticky;
-// Need to use JAXB first to register DatatypeConverter
 static {
+boolean b;
 try {
-JAXBContext.newInstance().createUnmarshaller();
+b = Boolean.getBoolean(HttpTransportPipe.class.getName()+".dump");
-} catch(JAXBException je) {
+} catch( Throwable t ) {
-// Nothing much can be done. Intentionally left empty
+b = false;
 }
+dump = b;
 }
 public HttpTransportPipe(Codec codec, WSBinding binding) {
 this.codec = codec;
 this.binding = binding;
 private HttpTransportPipe(HttpTransportPipe that, TubeCloner cloner) {
 this(that.codec.copy(), that.binding);
 cloner.add(that,this);
 }
+@Override
 public NextAction processException(@NotNull Throwable t) {
 return doThrow(t);
 }
+@Override
 public NextAction processRequest(@NotNull Packet request) {
 return doReturnWith(process(request));
 }
+@Override
 public NextAction processResponse(@NotNull Packet response) {
 return doReturnWith(response);
 }
 protected HttpClientTransport getTransport(Packet request, Map<String, List<String>> reqHeaders) {
 }
 if (binding instanceof SOAPBinding) {
 writeSOAPAction(reqHeaders, ct.getSOAPActionHeader());
 }
-if(dump || LOGGER.isLoggable(Level.FINER))
+if (dump || LOGGER.isLoggable(Level.FINER)) {
 dump(buf, "HTTP request", reqHeaders);
+}
 buf.writeTo(con.getOutput());
 } else {
 // Set static Content-Type
 reqHeaders.put("Content-Type", Collections.singletonList(ct.getContentType()));
 return code == 500 || code == 400;
 }
 private void addCookies(Packet context, Map<String, List<String>> reqHeaders) throws IOException {
 Boolean shouldMaintainSessionProperty =
 (Boolean) context.invocationProperties.get(BindingProvider.SESSION_MAINTAIN_PROPERTY);
 if (shouldMaintainSessionProperty != null && !shouldMaintainSessionProperty) {
 return;         // explicitly turned off
 }
 if (sticky || (shouldMaintainSessionProperty != null && shouldMaintainSessionProperty)) {
-Map<String, List<String>> cookies = cookieJar.get(context.endpointAddress.getURI(),reqHeaders);
+Map<String, List<String>> rememberedCookies = cookieJar.get(context.endpointAddress.getURI(), reqHeaders);
-List<String> cookieList = cookies.get("Cookie");
+processCookieHeaders(reqHeaders, rememberedCookies, "Cookie");
-if (cookieList != null && !cookieList.isEmpty()) {
+processCookieHeaders(reqHeaders, rememberedCookies, "Cookie2");
-reqHeaders.put("Cookie", cookieList);
+}
 }
-cookieList = cookies.get("Cookie2");
-if (cookieList != null && !cookieList.isEmpty()) {
+private void processCookieHeaders(Map<String, List<String>> requestHeaders, Map<String, List<String>> rememberedCookies, String cookieHeader) {
-reqHeaders.put("Cookie2", cookieList);
+List<String> jarCookies = rememberedCookies.get(cookieHeader);
-}
+if (jarCookies != null && !jarCookies.isEmpty()) {
+List<String> resultCookies = mergeUserCookies(jarCookies, requestHeaders.get(cookieHeader));
+requestHeaders.put(cookieHeader, resultCookies);
+}
+}
+private List<String> mergeUserCookies(List<String> rememberedCookies, List<String> userCookies) {
+// nothing to merge
+if (userCookies == null || userCookies.isEmpty()) {
+return rememberedCookies;
+}
+Map<String, String> map = new HashMap<String, String>();
+cookieListToMap(rememberedCookies, map);
+cookieListToMap(userCookies, map);
+return new ArrayList<String>(map.values());
+}
+private void cookieListToMap(List<String> cookieList, Map<String, String> targetMap) {
+for(String cookie : cookieList) {
+int index = cookie.indexOf("=");
+String cookieName = cookie.substring(0, index);
+targetMap.put(cookieName, cookie);
 }
 }
 private void recordCookies(Packet context, HttpClientTransport con) throws IOException {
 Boolean shouldMaintainSessionProperty =
 (Boolean) context.invocationProperties.get(BindingProvider.SESSION_MAINTAIN_PROPERTY);
 if (shouldMaintainSessionProperty != null && !shouldMaintainSessionProperty) {
 return;         // explicitly turned off
 }
 if (sticky || (shouldMaintainSessionProperty != null && shouldMaintainSessionProperty)) {
 cookieJar.put(context.endpointAddress.getURI(), con.getHeaders());
 private void addBasicAuth(Packet context, Map<String, List<String>> reqHeaders) {
 String user = (String) context.invocationProperties.get(BindingProvider.USERNAME_PROPERTY);
 if (user != null) {
 String pw = (String) context.invocationProperties.get(BindingProvider.PASSWORD_PROPERTY);
 if (pw != null) {
-StringBuffer buf = new StringBuffer(user);
+StringBuilder buf = new StringBuilder(user);
 buf.append(":");
 buf.append(pw);
 String creds = DatatypeConverter.printBase64Binary(buf.toString().getBytes());
 reqHeaders.put("Authorization", Collections.singletonList("Basic "+creds));
 }
 * write SOAPAction header if the soapAction parameter is non-null or BindingProvider properties set.
 * BindingProvider properties take precedence.
 */
 private void writeSOAPAction(Map<String, List<String>> reqHeaders, String soapAction) {
 //dont write SOAPAction HTTP header for SOAP 1.2 messages.
-if(SOAPVersion.SOAP_12.equals(binding.getSOAPVersion()))
+if(SOAPVersion.SOAP_12.equals(binding.getSOAPVersion())) {
 return;
-if (soapAction != null)
+}
+if (soapAction != null) {
 reqHeaders.put("SOAPAction", Collections.singletonList(soapAction));
-else
+} else {
 reqHeaders.put("SOAPAction", Collections.singletonList("\"\""));
 }
+}
+@Override
 public void preDestroy() {
 // nothing to do. Intentionally left empty.
 }
+@Override
 public HttpTransportPipe copy(TubeCloner cloner) {
 return new HttpTransportPipe(this,cloner);
 }
 buf.writeTo(baos);
 pw.println("--------------------");
 String msg = baos.toString();
 if (dump) {
 System.out.println(msg);
 }
 if (LOGGER.isLoggable(Level.FINER)) {
 LOGGER.log(Level.FINER, msg);
 }
 }
-/**
-* Dumps what goes across HTTP transport.
-*/
-public static boolean dump;
-static {
-boolean b;
-try {
-b = Boolean.getBoolean(HttpTransportPipe.class.getName()+".dump");
-} catch( Throwable t ) {
-b = false;
-}
-dump = b;
-}
 }

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

comparison: src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java

src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java