From e0b3c1b926dd506bd91fdfb7477ae713a4b81d6b Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 16 Jan 2013 15:11:13 -0700
Subject: [PATCH] Making sure cookies are set

---
 .../jetty/websocket/client/ClientUpgradeRequest.java        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
index b2584cad944..248002e7b04 100644
--- a/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
+++ b/jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
@@ -196,7 +196,11 @@ public class ClientUpgradeRequest extends UpgradeRequest
 
     public void setCookiesFrom(CookieStore cookieStore)
     {
-        // TODO Auto-generated method stub
+        if (cookieStore == null)
+        {
+            return;
+        }
 
+        setCookies(cookieStore.get(getRequestURI()));
     }
 }