diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-19 11:45:11 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-19 11:45:11 +0200 |
| commit | 558f4594241fba26f0b99357b4df234d49d72ae9 (patch) | |
| tree | 163a535827720b99bdc32f3eeb68ce5e7aedbc9b /java/src | |
| parent | Fixed ICE-4817: set default ACM timeout on registry OAs (diff) | |
| download | ice-558f4594241fba26f0b99357b4df234d49d72ae9.tar.bz2 ice-558f4594241fba26f0b99357b4df234d49d72ae9.tar.xz ice-558f4594241fba26f0b99357b4df234d49d72ae9.zip | |
Fixed ICE-3627 and ICE-3370: use of new async API and removed mono workaround in Network.cs
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceInternal/Instance.java | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index b285a643822..4bfe313538f 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -21,21 +21,33 @@ public final class Instance @Override public void updateConnectionObservers() { - _instance.outgoingConnectionFactory().updateConnectionObservers(); - _instance.objectAdapterFactory().updateConnectionObservers(); + try + { + _instance.outgoingConnectionFactory().updateConnectionObservers(); + _instance.objectAdapterFactory().updateConnectionObservers(); + } + catch(Ice.CommunicatorDestroyedException ex) + { + } } @Override public void updateThreadObservers() { - _instance.clientThreadPool().updateObservers(); - ThreadPool serverThreadPool = _instance.serverThreadPool(false); - if(serverThreadPool != null) + try + { + _instance.clientThreadPool().updateObservers(); + ThreadPool serverThreadPool = _instance.serverThreadPool(false); + if(serverThreadPool != null) + { + serverThreadPool.updateObservers(); + } + _instance.objectAdapterFactory().updateThreadObservers(); + _instance.endpointHostResolver().updateObserver(); + } + catch(Ice.CommunicatorDestroyedException ex) { - serverThreadPool.updateObservers(); } - _instance.objectAdapterFactory().updateThreadObservers(); - _instance.endpointHostResolver().updateObserver(); } final private Instance _instance; |