diff options
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Glacier2/SessionHelper.cs | 26 | ||||
| -rw-r--r-- | csharp/src/IceBox/ServiceManagerI.cs | 11 |
2 files changed, 6 insertions, 31 deletions
diff --git a/csharp/src/Glacier2/SessionHelper.cs b/csharp/src/Glacier2/SessionHelper.cs index d65b07ebb7e..9f15f0b9662 100644 --- a/csharp/src/Glacier2/SessionHelper.cs +++ b/csharp/src/Glacier2/SessionHelper.cs @@ -361,13 +361,7 @@ public class SessionHelper communicator.getLogger().warning("SessionHelper: unexpected exception when destroying the session:\n" + e); } - try - { - communicator.destroy(); - } - catch(Exception) - { - } + communicator.destroy(); // Notify the callback that the session is gone. dispatchCallback(() => @@ -384,13 +378,8 @@ public class SessionHelper { communicator = _communicator; } - try - { - communicator.destroy(); - } - catch(Exception) - { - } + + communicator.destroy(); } delegate SessionPrx ConnectStrategy(RouterPrx router); @@ -459,13 +448,8 @@ public class SessionHelper } catch(Exception ex) { - try - { - _communicator.destroy(); - } - catch(Exception) - { - } + _communicator.destroy(); + dispatchCallback(() => { _callback.connectFailed(this, ex); diff --git a/csharp/src/IceBox/ServiceManagerI.cs b/csharp/src/IceBox/ServiceManagerI.cs index 17757974413..51bfb0c47b7 100644 --- a/csharp/src/IceBox/ServiceManagerI.cs +++ b/csharp/src/IceBox/ServiceManagerI.cs @@ -990,16 +990,7 @@ class ServiceManagerI : ServiceManagerDisp_ } removeAdminFacets("IceBox.Service." + service + "."); - - try - { - communicator.destroy(); - } - catch(Exception e) - { - _logger.warning("ServiceManager: exception while destroying communicator for service " - + service + "\n" + e.ToString()); - } + communicator.destroy(); } } |