Added Communicator::isShutdown() and ObjectAdapter::isDeactivated()

4 files changed, 22 insertions, 0 deletions

diff --git a/java/CHANGES b/java/CHANGES
index f283095d0bc..3da3671df1a 100644
--- a/java/CHANGES
+++ b/java/CHANGES
@@ -1,6 +1,10 @@
 Changes since version 3.1.1
 ---------------------------     
 
+- Added Communicator::isShutdown() and ObjectAdapter::isDeactivated() to
+  allow applications to determine, respectively, whether communicator has
+  been shutdown or object adapter has been deactivated.
+
 - Added destroy method to the ObjectAdapter interface. It is necessary
   to call destroy to clean up the adapter resources and be able to
   recreate a new adapter with the same name. Communicator destroy
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 25d51cb72db..1bc2bcff748 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -29,6 +29,12 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator
 	_instance.objectAdapterFactory().waitForShutdown();
     }
 
+    public boolean
+    isShutdown()
+    {
+        return _instance.objectAdapterFactory().isShutdown();
+    }
+
     public Ice.ObjectPrx
     stringToProxy(String s)
     {
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 99fac61bf01..57c42b8b668 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -286,6 +286,12 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 	}
     }
 
+    public synchronized boolean
+    isDeactivated()
+    {
+        return _deactivated;
+    }
+
     public void
     destroy()
     {
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index 6d1a76509d6..bea099c7519 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -104,6 +104,12 @@ public final class ObjectAdapterFactory
 	}
     }
 
+    public synchronized boolean
+    isShutdown()
+    {
+        return _instance == null;
+    }
+
     public void
     destroy()
     {