[freenet-cvs] r20793 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-06-26 22:29:19 +0000 (Thu, 26 Jun 2008)
New Revision: 20793

Modified:
   branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
Log:
Make isEmpty() work for BaseSingleFileFetcher-derived classes

Modified: 
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-06-26 22:26:25 UTC (rev 20792)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-06-26 22:29:19 UTC (rev 20793)
@@ -21,6 +21,7 @@

        final ClientKey key;
        protected boolean cancelled;
+       protected boolean finished;
        final int maxRetries;
        private int retryCount;
        final FetchContext ctx;
@@ -132,7 +133,7 @@
        }

        public synchronized boolean isEmpty(ObjectContainer container) {
-               return cancelled;
+               return cancelled || finished;
        }

        public RequestClient getClient() {
@@ -152,6 +153,7 @@
                if(persistent)
                        container.activate(this, 2);
                synchronized(this) {
+                       finished = true;
                        if(isCancelled(container)) return;
                        if(!key.equals(this.key.getNodeKey())) {
                                Logger.normal(this, "Got sent key "+key+" but 
want "+this.key+" for "+this);