diff options
| author | Bernard Normier <bernard@zeroc.com> | 2010-06-23 16:17:26 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2010-06-23 16:17:26 -0400 |
| commit | 0e0dd27964e1bf174eb02fc3db2f7a56f905ca06 (patch) | |
| tree | 46622c1f5260f869e5d19ed2e1f14dfa805c39b0 /java/src/Freeze/EvictorIteratorI.java | |
| parent | Bug 4772 - Addin not installing over previous version (diff) | |
| download | ice-0e0dd27964e1bf174eb02fc3db2f7a56f905ca06.tar.bz2 ice-0e0dd27964e1bf174eb02fc3db2f7a56f905ca06.tar.xz ice-0e0dd27964e1bf174eb02fc3db2f7a56f905ca06.zip | |
Fix for bug #4785
Diffstat (limited to 'java/src/Freeze/EvictorIteratorI.java')
| -rwxr-xr-x[-rw-r--r--] | java/src/Freeze/EvictorIteratorI.java | 10 |
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; |