Author: toad
Date: 2009-04-01 00:15:29 +0000 (Wed, 01 Apr 2009)
New Revision: 26289

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
Log:
removeFrom() *after* storing the clientgetter, as in onSuccess, should fix it 
not getting stored


Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java    
2009-03-31 22:26:49 UTC (rev 26288)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java    
2009-04-01 00:15:29 UTC (rev 26289)
@@ -206,10 +206,6 @@
                if(logMINOR)
                        Logger.minor(this, "Failed from "+state+" : "+e+" on 
"+this, e);
                closeBinaryBlobStream(container, context);
-               if(persistent() && state != null) {
-                       container.activate(state, 1);
-                       state.removeFrom(container, context);
-               }
                if(persistent())
                        container.activate(uri, 5);
                while(true) {
@@ -249,8 +245,12 @@
                                container.activate(clientCallback, 1);
                        }
                        clientCallback.onFailure(e1, ClientGetter.this, 
container);
-                       return;
+                       break;
                }
+               if(persistent() && state != null) {
+                       container.activate(state, 1);
+                       state.removeFrom(container, context);
+               }
        }
 
        public void cancel(ObjectContainer container, ClientContext context) {

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to