From c7d9c5c95153fa939ea7b8666a5961e616aa9a76 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Fri, 9 Jan 2015 16:05:28 +0100 Subject: [PATCH] 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException. Fixed handling of cookies in case of null URI. --- .../java/org/eclipse/jetty/client/HttpConnection.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java index 54ace6faf68..e859d72eed8 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java @@ -135,13 +135,12 @@ public abstract class HttpConnection implements Connection if (cookieStore != null) { URI uri = request.getURI(); + StringBuilder cookies = null; if (uri != null) - { - StringBuilder cookies = convertCookies(cookieStore.get(uri), null); - cookies = convertCookies(request.getCookies(), cookies); - if (cookies != null) - request.header(HttpHeader.COOKIE.asString(), cookies.toString()); - } + cookies = convertCookies(cookieStore.get(uri), null); + cookies = convertCookies(request.getCookies(), cookies); + if (cookies != null) + request.header(HttpHeader.COOKIE.asString(), cookies.toString()); } // Authorization