Author: toad
Date: 2009-03-11 16:24:13 +0000 (Wed, 11 Mar 2009)
New Revision: 25984

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
Log:
Activation, logging


Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java    
2009-03-11 16:23:46 UTC (rev 25983)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java    
2009-03-11 16:24:13 UTC (rev 25984)
@@ -198,8 +198,10 @@
                        currentState = null;
                        oldProgress = null;
                }
-               if(oldState != null && persistent())
+               if(oldState != null && persistent()) {
+                       container.activate(oldState, 1);
                        oldState.removeFrom(container, context);
+               }
                if(state != null && state != oldState && persistent())
                        state.removeFrom(container, context);
                if(super.failedBlocks > 0 || super.fatallyFailedBlocks > 0 || 
super.successfulBlocks < super.totalBlocks) {
@@ -213,6 +215,7 @@
        }
 
        public void onFailure(InsertException e, ClientPutState state, 
ObjectContainer container, ClientContext context) {
+               if(Logger.shouldLog(Logger.MINOR, this)) Logger.minor(this, 
"onFailure() for "+this+" : "+state+" : "+e, e);
                if(persistent())
                        container.activate(client, 1);
                ClientPutState oldState;
@@ -222,8 +225,10 @@
                        currentState = null;
                        oldProgress = null;
                }
-               if(oldState != null && persistent())
+               if(oldState != null && persistent()) {
+                       container.activate(oldState, 1);
                        oldState.removeFrom(container, context);
+               }
                if(state != null && state != oldState && persistent())
                        state.removeFrom(container, context);
                if(persistent())

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

Reply via email to