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

[toad]

Author: toad
Date: 2009-03-26 13:13:56 +0000 (Thu, 26 Mar 2009)
New Revision: 26199

Modified:
   branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Deactivate


Modified: 
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2009-03-26 13:11:53 UTC (rev 26198)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2009-03-26 13:13:56 UTC (rev 26199)
@@ -1217,8 +1217,13 @@
                        container.store(this);
                
                for(int i=0;i<running.length;i++) {
-                       if(persistent) container.activate(running[i], 1);
+                       boolean active = true;
+                       if(persistent) {
+                               active = container.ext().isActive(running[i]);
+                               if(!active) container.activate(running[i], 1);
+                       }
                        running[i].cancel(container, context);
+                       if(!active) container.deactivate(running[i], 1);
                        if(persistent) container.activate(this, 1);
                }
                
@@ -1230,8 +1235,13 @@
                }
                
                for(int i=0;i<running.length;i++) {
-                       if(persistent) container.activate(runningMeta[i], 1);
+                       boolean active = true;
+                       if(persistent) {
+                               active = container.ext().isActive(running[i]);
+                               if(!active) container.activate(running[i], 1);
+                       }
                        runningMeta[i].cancel(container, context);
+                       if(!active) container.deactivate(running[i], 1);
                        if(persistent) container.activate(this, 1);
                }
                

_______________________________________________
cvs mailing list
cvs@freenetproject.org
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs