Author: toad
Date: 2008-06-14 14:05:32 +0000 (Sat, 14 Jun 2008)
New Revision: 20343
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
branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
Log:
More fixes
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-14
13:59:52 UTC (rev 20342)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-14
14:05:32 UTC (rev 20343)
@@ -105,7 +105,7 @@
tempFile = null;
try {
if(persistenceType == PERSIST_FOREVER)
- ret =
client.server.core.persistentTempBucketFactory.makeEncryptedBucket();
+ ret =
server.core.persistentTempBucketFactory.makeEncryptedBucket();
else
ret = fctx.bucketFactory.makeBucket(-1);
} catch (IOException e) {
@@ -175,7 +175,7 @@
tempFile = null;
try {
if(persistenceType == PERSIST_FOREVER)
- ret =
client.server.core.persistentTempBucketFactory.makeEncryptedBucket();
+ ret =
server.core.persistentTempBucketFactory.makeEncryptedBucket();
else
ret = fctx.bucketFactory.makeBucket(-1);
} catch (IOException e) {
@@ -262,14 +262,14 @@
ret = new NullBucket();
} else if(returnType == ClientGetMessage.RETURN_TYPE_DIRECT) {
try {
- ret =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"), fctx.random,
client.server.core.persistentTempBucketFactory);
+ ret =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"),
server.core.random, server.core.persistentTempBucketFactory);
if(ret == null) throw new
CannotCreateFromFieldSetException("ret == null");
} catch (CannotCreateFromFieldSetException e) {
Logger.error(this, "Cannot read: "+this+" :
"+e, e);
try {
// Create a new temp bucket
if(persistenceType == PERSIST_FOREVER)
- ret =
client.server.core.persistentTempBucketFactory.makeEncryptedBucket();
+ ret =
server.core.persistentTempBucketFactory.makeEncryptedBucket();
else
ret =
fctx.bucketFactory.makeBucket(-1);
} catch (IOException e1) {
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-14
13:59:52 UTC (rev 20342)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-14
14:05:32 UTC (rev 20343)
@@ -101,7 +101,7 @@
Bucket data, FreenetURI redirectTarget, String
targetFilename, boolean earlyEncode, FCPServer server) throws
IdentifierCollisionException, NotAllowedException, FileNotFoundException,
MalformedURLException {
super(uri, identifier, verbosity, null, globalClient,
priorityClass, persistenceType, null, true, getCHKOnly, dontCompress,
maxRetries, earlyEncode, server);
if(uploadFromType == ClientPutMessage.UPLOAD_FROM_DISK) {
- if(!globalClient.core.allowUploadFrom(origFilename))
+ if(!server.core.allowUploadFrom(origFilename))
throw new NotAllowedException();
if(!(origFilename.exists() && origFilename.canRead()))
throw new FileNotFoundException();
@@ -313,7 +313,7 @@
Logger.minor(this, "Uploading from direct for
"+this);
if(!finished) {
try {
- data =
SerializableToFieldSetBucketUtil.create(fs.subset("TempBucket"), ctx.random,
client.server.core.persistentTempBucketFactory);
+ data =
SerializableToFieldSetBucketUtil.create(fs.subset("TempBucket"),
server.core.random, server.core.persistentTempBucketFactory);
} catch (CannotCreateFromFieldSetException e) {
throw new
PersistenceParseException("Could not read old bucket for "+identifier+" : "+e,
e);
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-14 13:59:52 UTC (rev 20342)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-14 14:05:32 UTC (rev 20343)
@@ -126,7 +126,7 @@
return map;
}
- private void makePutter() {
+ private void makePutter(FCPServer server) {
SimpleManifestPutter p;
try {
p = new SimpleManifestPutter(this,
server.core.requestStarters.chkPutScheduler,
server.core.requestStarters.sskPutScheduler,
@@ -174,7 +174,7 @@
long sz =
Long.parseLong(subset.get("DataLength"));
if(!finished) {
try {
- data =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"), ctx.random,
server.core.persistentTempBucketFactory);
+ data =
SerializableToFieldSetBucketUtil.create(fs.subset("ReturnBucket"),
server.core.random, server.core.persistentTempBucketFactory);
} catch
(CannotCreateFromFieldSetException e) {
throw new
PersistenceParseException("Could not read old bucket for "+identifier+" : "+e,
e);
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-14 13:59:52 UTC (rev 20342)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientRequest.java
2008-06-14 14:05:32 UTC (rev 20343)
@@ -239,13 +239,13 @@
protected abstract void freeData();
/** Request completed. But we may have to stick around until we are
acked. */
- protected void finish() {
+ protected void finish(FCPServer server) {
completionTime = System.currentTimeMillis();
if(persistenceType == ClientRequest.PERSIST_CONNECTION)
origHandler.finishedClientRequest(this);
else
- client.server.forceStorePersistentRequests();
- client.finishedClientRequest(this);
+ server.forceStorePersistentRequests();
+ client.finishedClientRequest(this, server);
}
/**
@@ -282,10 +282,10 @@
*/
public abstract boolean isTotalFinalized();
- public void onMajorProgress() {
+ public void onMajorProgress(FCPServer server) {
if(persistenceType != ClientRequest.PERSIST_CONNECTION) {
if(client != null)
- client.server.forceStorePersistentRequests();
+ server.forceStorePersistentRequests();
}
}
@@ -310,7 +310,7 @@
* Called after a ModifyPersistentRequest.
* Sends a PersistentRequestModified message to clients if any value
changed.
*/
- public void modifyRequest(String newClientToken, short
newPriorityClass) {
+ public void modifyRequest(String newClientToken, short
newPriorityClass, FCPServer server) {
boolean clientTokenChanged = false;
boolean priorityClassChanged = false;
@@ -336,7 +336,7 @@
if( clientTokenChanged || priorityClassChanged ) {
if(persistenceType != ClientRequest.PERSIST_CONNECTION)
{
if(client != null) {
-
client.server.forceStorePersistentRequests();
+ server.forceStorePersistentRequests();
}
}
} else {
@@ -372,7 +372,7 @@
synchronized(this) {
this.started = false;
}
- client.core.getExecutor().execute(new Runnable() {
+ executor.execute(new Runnable() {
public void run() {
restart();
}
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2008-06-14 13:59:52 UTC (rev 20342)
+++ branches/db4o/freenet/src/freenet/node/fcp/ModifyPersistentRequest.java
2008-06-14 14:05:32 UTC (rev 20343)
@@ -74,7 +74,7 @@
return;
}
- req.modifyRequest(clientToken, priorityClass);
+ req.modifyRequest(clientToken, priorityClass,
node.clientCore.getFCPServer());
}
}
