diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-09-08 14:43:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-09-08 14:43:04 +0200 |
| commit | a13ed5c595fd7492a4ecb2c0712efff4f2af807c (patch) | |
| tree | 021afa5085f74a58d461ccae6471a38dd13a7170 /csharp/src | |
| parent | Fixed ICE-6777 - Increased IceGrid session timeout (diff) | |
| download | ice-a13ed5c595fd7492a4ecb2c0712efff4f2af807c.tar.bz2 ice-a13ed5c595fd7492a4ecb2c0712efff4f2af807c.tar.xz ice-a13ed5c595fd7492a4ecb2c0712efff4f2af807c.zip | |
Fixed ICE-6778 - background test failure
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/ConnectRequestHandler.cs | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/csharp/src/Ice/ConnectRequestHandler.cs b/csharp/src/Ice/ConnectRequestHandler.cs index fe93d6e4fb6..2ee1e4f66b0 100644 --- a/csharp/src/Ice/ConnectRequestHandler.cs +++ b/csharp/src/Ice/ConnectRequestHandler.cs @@ -22,27 +22,11 @@ namespace IceInternal { lock(this) { - try - { - if(!initialized()) - { - _proxies.Add(proxy); - } - } - catch(Ice.LocalException ex) + if(!initialized()) { - // - // Only throw if the connection didn't get established. If - // it died after being established, we allow the caller to - // retry the connection establishment by not throwing here. - // - if(_connection == null) - { - throw ex; - } + _proxies.Add(proxy); } - - return proxy.setRequestHandler__(_requestHandler); + return _requestHandler; } } @@ -226,6 +210,16 @@ namespace IceInternal if(_exception != null) { + if(_connection != null) + { + // + // Only throw if the connection didn't get established. If + // it died after being established, we allow the caller to + // retry the connection establishment by not throwing here + // (the connection will throw RetryException). + // + return true; + } throw _exception; } else |