diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-08-30 12:06:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-08-30 12:06:08 +0200 |
| commit | 552d3e916337b7fedec06b05b0f78d9ab3084dc2 (patch) | |
| tree | 1846d3b0ae27163cac0191fd305f93fb77005eaf /java-compat | |
| parent | Fixed Ice/admin test to not wait indefinitely, fixes #343 (diff) | |
| download | ice-552d3e916337b7fedec06b05b0f78d9ab3084dc2.tar.bz2 ice-552d3e916337b7fedec06b05b0f78d9ab3084dc2.tar.xz ice-552d3e916337b7fedec06b05b0f78d9ab3084dc2.zip | |
Fixed IceBox exception handling, fixes #486
Diffstat (limited to 'java-compat')
| -rw-r--r-- | java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java index 15c8af6c9c2..0b2738cb64a 100644 --- a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java +++ b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java @@ -410,19 +410,10 @@ public class ServiceManagerI extends _ServiceManagerDisp // Start Admin (if enabled) and/or deprecated IceBox.ServiceManager OA // _communicator.addAdminFacet(this, "IceBox.ServiceManager"); - try + _communicator.getAdmin(); + if(adapter != null) { - _communicator.getAdmin(); - if(adapter != null) - { - adapter.activate(); - } - } - catch(Ice.ObjectAdapterDeactivatedException ex) - { - // - // Expected if the communicator has been shutdown. - // + adapter.activate(); } // @@ -454,6 +445,14 @@ public class ServiceManagerI extends _ServiceManagerDisp _logger.error(sw.toString()); return 1; } + catch(Ice.CommunicatorDestroyedException ex) + { + // Expected if the communicator is shutdown by the shutdown hook + } + catch(Ice.ObjectAdapterDeactivatedException ex) + { + // Expected if the communicator is shutdown by the shutdown hook + } catch(Throwable ex) { java.io.StringWriter sw = new java.io.StringWriter(); |