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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-24 12:19:14 +0000 (Thu, 24 Jul 2008)
New Revision: 21361

Modified:
   branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
Log:
Deactivation

Modified: 
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-07-24 12:15:47 UTC (rev 21360)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java   
2008-07-24 12:19:14 UTC (rev 21361)
@@ -197,8 +197,10 @@
                        Logger.error(this, "onGotKey("+key+","+block+") got 
"+e+" for "+this, e);
                        // FIXME if we get rid of the direct route this must 
call onFailure()
                }
-               if(persistent)
+               if(persistent) {
                        container.deactivate(this, 1);
+                       container.deactivate(this.key, 1);
+               }
        }


@@ -230,6 +232,8 @@
                if(Logger.shouldLog(Logger.MINOR, this))
                        Logger.minor(this, "Requeueing after cooldown "+key+" 
for "+this);
                schedule(container, context, false);
+               if(persistent)
+                       container.deactivate(this.key, 5);
        }

        public void schedule(ObjectContainer container, ClientContext context, 
boolean delayed) {