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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-16 22:33:07 +0000 (Mon, 16 Jun 2008)
New Revision: 20390

Modified:
   branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
   branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
Log:
Add parameters to restart(), it will need to be run on the db thread

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-06-16 
22:30:07 UTC (rev 20389)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java   2008-06-16 
22:33:07 UTC (rev 20390)
@@ -724,7 +724,7 @@
                return getter.canRestart();
        }

-       public boolean restart() {
+       public boolean restart(ObjectContainer container, ClientContext 
context) {
                if(!canRestart()) return false;
                FreenetURI redirect;
                synchronized(this) {
@@ -738,7 +738,7 @@
                        started = false;
                }
                try {
-                       if(getter.restart(redirect)) {
+                       if(getter.restart(redirect, container, context)) {
                                synchronized(this) {
                                        if(redirect != null) this.uri = 
redirect;
                                        started = true;
@@ -746,7 +746,7 @@
                        }
                        return true;
                } catch (FetchException e) {
-                       onFailure(e, null);
+                       onFailure(e, null, container);
                        return false;
                }
        }

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java   2008-06-16 
22:30:07 UTC (rev 20389)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java   2008-06-16 
22:33:07 UTC (rev 20390)
@@ -479,11 +479,11 @@
                return putter.canRestart();
        }

-       public boolean restart() {
+       public boolean restart(ObjectContainer container, ClientContext 
context) {
                if(!canRestart()) return false;
                setVarsRestart();
                try {
-                       if(putter.restart(earlyEncode)) {
+                       if(putter.restart(earlyEncode, container, context)) {
                                synchronized(this) {
                                        generatedURI = null;
                                        started = true;
@@ -491,7 +491,7 @@
                        }
                        return true;
                } catch (InsertException e) {
-                       onFailure(e, null);
+                       onFailure(e, null, container);
                        return false;
                }
        }

Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java        
2008-06-16 22:30:07 UTC (rev 20389)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java        
2008-06-16 22:33:07 UTC (rev 20390)
@@ -358,11 +358,11 @@
                return true;
        }

-       public boolean restart() {
+       public boolean restart(ObjectContainer container, ClientContext 
context) {
                if(!canRestart()) return false;
                setVarsRestart();
                makePutter();
-               start();
+               start(container, context);
                return true;
        }


Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java       
2008-06-16 22:30:07 UTC (rev 20389)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java       
2008-06-16 22:33:07 UTC (rev 20390)
@@ -299,7 +299,7 @@

        public abstract boolean canRestart();

-       public abstract boolean restart();
+       public abstract boolean restart(ObjectContainer container, 
ClientContext context);

        protected abstract FCPMessage persistentTagMessage();