1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/Freeze/EvictorIteratorI.java b/java/src/Freeze/EvictorIteratorI.java
index e96bffefc2f..938da54afc2 100644..100755
--- a/java/src/Freeze/EvictorIteratorI.java
+++ b/java/src/Freeze/EvictorIteratorI.java
@@ -58,6 +58,11 @@ class EvictorIteratorI implements EvictorIterator
     private java.util.Iterator<Ice.Identity>
     nextBatch()
     {
+	if(!_more)
+        {
+	    return null;
+	}
+
         EvictorI.DeactivateController deactivateController = _store.evictor().deactivateController();
         deactivateController.lock();
 
@@ -65,11 +70,6 @@ class EvictorIteratorI implements EvictorIterator
 
         try
         {
-            if(!_more)
-            {
-                return null;
-            }
-
             Ice.Communicator communicator = _store.communicator();
 
             byte[] firstKey = null;