summaryrefslogtreecommitdiff
path: root/java/src/IceBox/ServiceManagerI.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-09-18 11:21:00 -0400
committerBernard Normier <bernard@zeroc.com>2007-09-18 11:21:00 -0400
commit15fec2519f3bbea20349aa971f8a76cfa7c83363 (patch)
treebe529a224ece49a857f30e44af2888a95639868f /java/src/IceBox/ServiceManagerI.java
parentAdded comment to CHANGES (diff)
downloadice-15fec2519f3bbea20349aa971f8a76cfa7c83363.tar.bz2
ice-15fec2519f3bbea20349aa971f8a76cfa7c83363.tar.xz
ice-15fec2519f3bbea20349aa971f8a76cfa7c83363.zip
Squashed commit of the following:
commit 70a72ca50d39f20ab8d850f0842a8cd2c2a8351d Author: Bernard Normier <bernard@zeroc.com> Date: Tue Sep 18 11:18:19 2007 -0400 Bug fixes commit 2983094468845f39614128cd82973b9c503680a5 Author: Bernard Normier <bernard@zeroc.com> Date: Fri Sep 7 11:00:18 2007 -0400 First commit for bug 1532
Diffstat (limited to 'java/src/IceBox/ServiceManagerI.java')
-rw-r--r--java/src/IceBox/ServiceManagerI.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java
index d63bb237763..c810ce9531b 100644
--- a/java/src/IceBox/ServiceManagerI.java
+++ b/java/src/IceBox/ServiceManagerI.java
@@ -234,6 +234,20 @@ public class ServiceManagerI extends _ServiceManagerDisp
}
}
+ //
+ // Register "this" as a facet to the Admin object
+ //
+ try
+ {
+ _server.communicator().addAdminFacet(this, "IceBox.ServiceManager");
+ }
+ catch(Ice.CommunicatorDestroyedException ex)
+ {
+ //
+ // Ignored
+ //
+ }
+
_server.communicator().waitForShutdown();
_server.defaultInterrupt();