Author: toad
Date: 2008-06-16 22:16:29 +0000 (Mon, 16 Jun 2008)
New Revision: 20387
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.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
Log:
Mostly compile fixes - passing containers around, deleting dead code
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-16
22:07:37 UTC (rev 20386)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-16
22:16:29 UTC (rev 20387)
@@ -341,7 +341,7 @@
// Otherwise ignore
}
- public void onSuccess(FetchResult result, ClientGetter state) {
+ public void onSuccess(FetchResult result, ClientGetter state,
ObjectContainer container) {
Logger.minor(this, "Succeeded: "+identifier);
Bucket data = result.asBucket();
if(returnBucket != data && !binaryBlob) {
@@ -411,7 +411,7 @@
trySendAllDataMessage(adm, null);
if(!dontFree)
data.free();
- finish();
+ finish(container);
client.notifySuccess(this);
}
@@ -482,7 +482,7 @@
return new PersistentGet(identifier, uri, verbosity,
priorityClass, returnType, persistenceType, targetFile, tempFile, clientToken,
client.isGlobalQueue, started, fctx.maxNonSplitfileRetries, binaryBlob,
fctx.maxOutputLength);
}
- public void onFailure(FetchException e, ClientGetter state) {
+ public void onFailure(FetchException e, ClientGetter state,
ObjectContainer container) {
if(finished) return;
synchronized(this) {
succeeded = false;
@@ -493,10 +493,8 @@
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Caught "+e, e);
trySendDataFoundOrGetFailed(null);
- finish();
+ finish(container);
client.notifyFailure(this);
- if(persistenceType != PERSIST_CONNECTION)
- client.server.forceStorePersistentRequests();
}
public void onSuccess(BaseClientPutter state) {
@@ -511,7 +509,7 @@
// Ignore
}
- public void requestWasRemoved() {
+ public void requestWasRemoved(ObjectContainer container) {
// if request is still running, send a GetFailed with
code=cancelled
if( !finished ) {
synchronized(this) {
@@ -527,7 +525,7 @@
client.queueClientRequestMessage(msg, 0);
freeData();
- finish();
+ finish(container);
}
public void receive(ClientEvent ce) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-06-16 22:07:37 UTC (rev 20386)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutBase.java
2008-06-16 22:16:29 UTC (rev 20387)
@@ -2,6 +2,8 @@
import java.net.MalformedURLException;
+import com.db4o.ObjectContainer;
+
import freenet.client.*;
import freenet.client.async.BaseClientPutter;
import freenet.client.async.ClientCallback;
@@ -131,7 +133,7 @@
// otherwise ignore
}
- public void onSuccess(BaseClientPutter state) {
+ public void onSuccess(BaseClientPutter state, ObjectContainer
container) {
synchronized(this) {
// Including this helps with certain bugs...
//progressMessage = null;
@@ -139,25 +141,21 @@
finished = true;
}
freeData();
- finish();
+ finish(container);
trySendFinalMessage(null);
client.notifySuccess(this);
- if(persistenceType != PERSIST_CONNECTION)
- client.server.forceStorePersistentRequests();
}
- public void onFailure(InsertException e, BaseClientPutter state) {
+ public void onFailure(InsertException e, BaseClientPutter state,
ObjectContainer container) {
if(finished) return;
synchronized(this) {
finished = true;
putFailedMessage = new PutFailedMessage(e, identifier,
global);
}
freeData();
- finish();
+ finish(container);
trySendFinalMessage(null);
client.notifyFailure(this);
- if(persistenceType != PERSIST_CONNECTION)
- client.server.forceStorePersistentRequests();
}
public void onGeneratedURI(FreenetURI uri, BaseClientPutter state) {
@@ -169,7 +167,7 @@
trySendGeneratedURIMessage(null);
}
- public void requestWasRemoved() {
+ public void requestWasRemoved(ObjectContainer container) {
// if request is still running, send a PutFailed with
code=cancelled
if( !finished ) {
synchronized(this) {
@@ -184,7 +182,7 @@
client.queueClientRequestMessage(msg, 0);
freeData();
- finish();
+ finish(container);
}
public void receive(ClientEvent ce) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-16 22:07:37 UTC (rev 20386)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-16 22:16:29 UTC (rev 20387)
@@ -50,7 +50,7 @@
this.wasDiskPut = wasDiskPut;
this.manifestElements = manifestElements;
this.defaultName = message.defaultName;
- makePutter();
+ makePutter(server);
if(putter != null) {
numberOfFiles = putter.countFiles();
totalSize = putter.totalSize();
@@ -71,7 +71,7 @@
logMINOR = Logger.shouldLog(Logger.MINOR, this);
this.manifestElements = makeDiskDirManifest(dir, "",
allowUnreadableFiles);
this.defaultName = defaultName;
- makePutter();
+ makePutter(server);
if(putter != null) {
numberOfFiles = putter.countFiles();
totalSize = putter.totalSize();
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-16 22:07:37 UTC (rev 20386)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-16 22:16:29 UTC (rev 20387)
@@ -241,13 +241,11 @@
protected abstract void freeData();
/** Request completed. But we may have to stick around until we are
acked. */
- protected void finish(FCPServer server) {
+ protected void finish(ObjectContainer container) {
completionTime = System.currentTimeMillis();
if(persistenceType == ClientRequest.PERSIST_CONNECTION)
origHandler.finishedClientRequest(this);
- else
- server.forceStorePersistentRequests();
- client.finishedClientRequest(this, server);
+ client.finishedClientRequest(this, container);
}
/**
@@ -284,7 +282,7 @@
*/
public abstract boolean isTotalFinalized();
- public void onMajorProgress(FCPServer server) {
+ public void onMajorProgress() {
// Ignore
}
@@ -359,7 +357,7 @@
/**
* Called after a RemovePersistentRequest. Send a
PersistentRequestRemoved to the clients.
*/
- public abstract void requestWasRemoved();
+ public abstract void requestWasRemoved(ObjectContainer container);
/** Utility method for storing details of a possibly encrypted bucket.
*/
protected void bucketToFS(SimpleFieldSet fs, String name, boolean
includeSize, Bucket data) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-16
22:07:37 UTC (rev 20386)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-16
22:16:29 UTC (rev 20387)
@@ -95,7 +95,7 @@
* Called when a client request has finished, but is persistent. It has
not been
* acked yet, so it should be moved to the unacked-completed-requests
set.
*/
- public void finishedClientRequest(ClientRequest get, FCPServer server,
ObjectContainer container) {
+ public void finishedClientRequest(ClientRequest get, ObjectContainer
container) {
assert((persistenceType == ClientRequest.PERSIST_FOREVER) ==
(container != null));
assert(get.persistenceType == persistenceType);
synchronized(this) {
@@ -166,7 +166,7 @@
throw new
MessageInvalidException(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, "Not found",
identifier, isGlobalQueue);
clientRequestsByIdentifier.remove(identifier);
}
- req.requestWasRemoved();
+ req.requestWasRemoved(container);
if(kill) {
if(logMINOR) Logger.minor(this, "Killing request "+req);
req.cancel();
