From 141deb91a7bf837dba79a36bc64ad1383398a419 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Fri, 29 Apr 2016 10:35:53 +0200
Subject: Fixed bug where connection to SOCKs/HTTP proxies could hang under
 certain conditions

---
 java/src/Ice/src/main/java/IceInternal/StreamSocket.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/src')

diff --git a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
index c628d791d71..03cd265e0e6 100644
--- a/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
+++ b/java/src/Ice/src/main/java/IceInternal/StreamSocket.java
@@ -27,7 +27,7 @@ public class StreamSocket
             init();
             if(Network.doConnect(_fd, _proxy != null ? _proxy.getAddress() : _addr, sourceAddr))
             {
-                _state = StateConnected;
+                _state = _proxy != null ? StateProxyWrite : StateConnected;
             }
         }
         catch(Ice.LocalException ex)
-- 
cgit v1.2.3