1 files changed, 17 insertions, 1 deletions
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index 022804f6acc..3dac7bce381 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -125,12 +125,28 @@ class EvictorI implements Evictor
 	_initializer = initializer;
     }
 
-    public EvictorIterator
+    synchronized public EvictorIterator
     getIterator()
     {
+	if (_deactivated)
+	{
+	    throw new EvictorDeactivatedException();
+	}
+	
 	return new EvictorIteratorI(_dict.keySet().iterator());
     }
 
+    synchronized public boolean
+    hasObject(Ice.Identity ident)
+    {
+	if (_deactivated)
+	{
+	    throw new EvictorDeactivatedException();
+	}
+	
+	return _evictorMap.get(ident) != null;
+    }
+
     synchronized public Ice.Object
     locate(Ice.ObjectAdapter adapter, Ice.Current current, Ice.LocalObjectHolder cookie)
     {