[freenet-cvs] r21363 - branches/db4o/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2008-07-24 12:20:49 +0000 (Thu, 24 Jul 2008)
New Revision: 21363

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
   branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
Log:
Fix activation depth here.

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-07-24 
12:19:40 UTC (rev 21362)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java   2008-07-24 
12:20:49 UTC (rev 21363)
@@ -422,7 +422,10 @@
                return null;
        }

-       public void init() {
+       public void init(ObjectContainer container) {
+               container.activate(runningPersistentRequests, 1);
+               container.activate(completedUnackedRequests, 1);
+               container.activate(clientRequestsByIdentifier, 1);
                ((Db4oList)runningPersistentRequests).activationDepth(1);
                ((Db4oList)completedUnackedRequests).activationDepth(1);
                ((Db4oMap)clientRequestsByIdentifier).activationDepth(1);

Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java   
2008-07-24 12:19:40 UTC (rev 21362)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPPersistentRoot.java   
2008-07-24 12:20:49 UTC (rev 21363)
@@ -37,7 +37,7 @@
                        System.err.println("Loaded FCP persistent root.");
                        FCPPersistentRoot root = (FCPPersistentRoot) set.next();
                        container.activate(root, 2);
-                       root.globalForeverClient.init();
+                       root.globalForeverClient.init(container);
                        return root;
                }
                FCPPersistentRoot root = new FCPPersistentRoot(nodeDBHandle, 
container);
@@ -73,7 +73,7 @@
                        if(!(name.equals(client.name)))
                                Logger.error(this, "Returning "+client+" for 
"+name);
                        if(Logger.shouldLog(Logger.MINOR, this)) 
Logger.minor(this, "Returning "+client+" for "+name);
-                       client.init();
+                       client.init(container);
                        return client;
                }
                FCPClient client = new FCPClient(name, handler, false, null, 
ClientRequest.PERSIST_FOREVER, this, container);