Author: toad
Date: 2009-03-12 19:00:25 +0000 (Thu, 12 Mar 2009)
New Revision: 26006
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
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/ClientPutBase.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
Add ,context to ClientGetter.removeFrom() and ClientRequest.requestWasRemoved()
Modified: branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/client/async/ClientGetter.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -412,13 +412,13 @@
return clientCallback;
}
- public void removeFrom(ObjectContainer container) {
+ public void removeFrom(ObjectContainer container, ClientContext
context) {
container.activate(uri, 5);
uri.removeFrom(container);
container.activate(ctx, 1);
ctx.removeFrom(container);
container.activate(actx, 5);
actx.removeFrom(container);
- super.removeFrom(container);
+ super.removeFrom(container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -352,7 +352,8 @@
// Ignore, at the moment
}
- public void removeFrom(ObjectContainer container) {
+ @Override
+ public void removeFrom(ObjectContainer container, ClientContext
context) {
container.activate(cm, 2);
cm.removeFrom(container);
container.activate(ctx, 1);
@@ -364,6 +365,6 @@
container.activate(uri, 5);
uri.removeFrom(container);
}
- super.removeFrom(container);
+ super.removeFrom(container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequester.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -179,7 +179,7 @@
}
- public void removeFrom(ObjectContainer container) {
+ public void removeFrom(ObjectContainer container, ClientContext
context) {
container.activate(requests, 1);
requests.removeFrom(container);
container.delete(this);
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2009-03-12
17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2009-03-12
19:00:25 UTC (rev 26006)
@@ -593,7 +593,7 @@
}
@Override
- public void requestWasRemoved(ObjectContainer container) {
+ public void requestWasRemoved(ObjectContainer container, ClientContext
context) {
// if request is still running, send a GetFailed with
code=cancelled
if( !finished ) {
synchronized(this) {
@@ -618,7 +618,7 @@
container.delete(fctx.allowedMIMETypes);
}
fctx.removeFrom(container);
- getter.removeFrom(container);
+ getter.removeFrom(container, context);
if(targetFile != null)
container.delete(targetFile);
if(tempFile != null)
@@ -640,7 +640,7 @@
progressPending.removeFrom(container);
}
}
- super.requestWasRemoved(container);
+ super.requestWasRemoved(container, context);
}
public void receive(ClientEvent ce, ObjectContainer container,
ClientContext context) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2009-03-12
17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2009-03-12
19:00:25 UTC (rev 26006)
@@ -528,10 +528,10 @@
}
@Override
- public void requestWasRemoved(ObjectContainer container) {
+ public void requestWasRemoved(ObjectContainer container, ClientContext
context) {
if(persistenceType == PERSIST_FOREVER) {
container.activate(putter, 1);
- putter.removeFrom(container);
+ putter.removeFrom(container, context);
putter = null;
if(origFilename != null) {
container.activate(origFilename, 5);
@@ -543,6 +543,6 @@
targetURI.removeFrom(container);
}
}
- super.requestWasRemoved(container);
+ super.requestWasRemoved(container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -186,7 +186,7 @@
}
@Override
- public void requestWasRemoved(ObjectContainer container) {
+ public void requestWasRemoved(ObjectContainer container, ClientContext
context) {
// if request is still running, send a PutFailed with
code=cancelled
if( !finished ) {
synchronized(this) {
@@ -230,7 +230,7 @@
container.activate(publicURI, 5);
publicURI.removeFrom(container);
}
- super.requestWasRemoved(container);
+ super.requestWasRemoved(container, context);
}
public void receive(final ClientEvent ce, ObjectContainer container,
ClientContext context) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -384,12 +384,12 @@
}
@Override
- public void requestWasRemoved(ObjectContainer container) {
+ public void requestWasRemoved(ObjectContainer container, ClientContext
context) {
if(persistenceType == PERSIST_FOREVER) {
container.activate(putter, 1);
- putter.removeFrom(container);
+ putter.removeFrom(container, context);
putter = null;
}
- super.requestWasRemoved(container);
+ super.requestWasRemoved(container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -435,7 +435,7 @@
* Called after a RemovePersistentRequest. Send a
PersistentRequestRemoved to the clients.
* If the request is in the database, delete it.
*/
- public void requestWasRemoved(ObjectContainer container) {
+ public void requestWasRemoved(ObjectContainer container, ClientContext
context) {
if(persistenceType != PERSIST_FOREVER) return;
if(uri != null) uri.removeFrom(container);
container.delete(this);
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-03-12
17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2009-03-12
19:00:25 UTC (rev 26006)
@@ -203,7 +203,7 @@
if(logMINOR) Logger.minor(this, "Killing request "+req);
req.cancel(container, context);
}
- req.requestWasRemoved(container);
+ req.requestWasRemoved(container, context);
if(completionCallback != null)
completionCallback.onRemove(req, container);
return true;
@@ -421,7 +421,7 @@
while(i.hasNext()) {
ClientRequest req = (ClientRequest) i.next();
req.cancel(container, context);
- req.requestWasRemoved(container);
+ req.requestWasRemoved(container, context);
}
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2009-03-12 17:30:42 UTC (rev 26005)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2009-03-12 19:00:25 UTC (rev 26006)
@@ -610,7 +610,7 @@
if(req != null) {
if(kill)
req.cancel(null, server.core.clientContext);
- req.requestWasRemoved(null);
+ req.requestWasRemoved(null, server.core.clientContext);
}
return req;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
