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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-01 14:35:13 +0000 (Tue, 01 Jul 2008)
New Revision: 20910

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
   branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
MUST update database after cancelling!

Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java    
2008-07-01 14:15:28 UTC (rev 20909)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java    
2008-07-01 14:35:13 UTC (rev 20910)
@@ -214,6 +214,8 @@
                        super.cancel();
                        s = currentState;
                }
+               if(persistent())
+                       container.set(this);
                if(s != null) {
                        if(logMINOR) Logger.minor(this, "Cancelling 
"+currentState);
                        if(persistent())

Modified: 
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-07-01 14:15:28 UTC (rev 20909)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2008-07-01 14:35:13 UTC (rev 20910)
@@ -626,6 +626,8 @@
                        running = (PutHandler[]) runningPutHandlers.toArray(new 
PutHandler[runningPutHandlers.size()]);
                        finished = true;
                }
+               if(persistent())
+                       container.set(this);

                for(int i=0;i<running.length;i++) {
                        running[i].cancel();
@@ -634,6 +636,8 @@

        public void cancel(ObjectContainer container) {
                super.cancel();
+               if(persistent())
+                       container.set(this);
                fail(new InsertException(InsertException.CANCELLED), container);
        }