[freenet-cvs] r20530 - in branches/db4o/freenet/src/freenet: client client/async support

[t...@freenetproject.org]

Author: toad
Date: 2008-06-20 16:38:37 +0000 (Fri, 20 Jun 2008)
New Revision: 20530

Modified:
   branches/db4o/freenet/src/freenet/client/InsertBlock.java
   branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
   branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
Log:
More cascading activation.

Modified: branches/db4o/freenet/src/freenet/client/InsertBlock.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/InsertBlock.java   2008-06-20 
16:21:47 UTC (rev 20529)
+++ branches/db4o/freenet/src/freenet/client/InsertBlock.java   2008-06-20 
16:38:37 UTC (rev 20530)
@@ -44,4 +44,11 @@
                        container.delete(this);
                }
        }
+       
+       public void objectOnActivate(ObjectContainer container) {
+               // Cascading activation of dependancies
+               container.activate(data, 1); // will cascade
+               container.activate(desiredURI, 1);
+       }
+
 }

Modified: branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-20 16:21:47 UTC (rev 20529)
+++ branches/db4o/freenet/src/freenet/client/async/SingleFileInserter.java      
2008-06-20 16:38:37 UTC (rev 20530)
@@ -104,9 +104,9 @@
                                }
                        }
                }
-               Bucket data = block.getData();
-               if(parent.persistent())
-                       container.activate(data, 1); // Buckets will cascade if 
necessary
+               if(parent.persistent()) {
+                       container.activate(block, 1); // will cascade
+               }
                tryCompress(container, context);
        }


Modified: branches/db4o/freenet/src/freenet/support/RandomGrabArray.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/RandomGrabArray.java      
2008-06-20 16:21:47 UTC (rev 20529)
+++ branches/db4o/freenet/src/freenet/support/RandomGrabArray.java      
2008-06-20 16:38:37 UTC (rev 20530)
@@ -249,4 +249,7 @@
                return persistent;
        }

+       public void objectOnActivate(ObjectContainer container) {
+               container.activate(contents, 1);
+       }
 }