diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-04-29 10:35:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-10 21:54:56 +0200 |
| commit | 4a14f7503e36c1f0111ebba12969fdbab21cdc5f (patch) | |
| tree | 33cf8620a035d45667c9d351e0d6e83e2d0dd199 /java/src | |
| parent | IceSSL/configuration test fixes for Debian kFreeBSD (diff) | |
| download | ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.tar.bz2 ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.tar.xz ice-4a14f7503e36c1f0111ebba12969fdbab21cdc5f.zip | |
Fixed bug where connection to SOCKs/HTTP proxies could hang under certain conditions
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/StreamSocket.java | 2 |
1 files changed, 1 insertions, 1 deletions
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) |