Author: nextgens
Date: 2007-04-13 12:57:26 +0000 (Fri, 13 Apr 2007)
New Revision: 12623
Modified:
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/node/fcp/FCPClient.java
Log:
Don't use the client but the handler: maybe fix sace's bug
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2007-04-13 12:50:20 UTC
(rev 12622)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2007-04-13 12:57:26 UTC
(rev 12623)
@@ -150,7 +150,7 @@
this.tempFile = message.tempFile;
if(!(client.core.allowDownloadTo(tempFile) &&
client.core.allowDownloadTo(targetFile)))
throw new
MessageInvalidException(ProtocolErrorMessage.ACCESS_DENIED, "Not allowed to
download to "+tempFile+" or "+targetFile, identifier, global);
- else if(!(client.getConnection().allowDDAFrom(tempFile,
true) && client.getConnection().allowDDAFrom(targetFile, true)))
+ else if(!(handler.allowDDAFrom(tempFile, true) &&
handler.allowDDAFrom(targetFile, true)))
throw new
MessageInvalidException(ProtocolErrorMessage.DIRECT_DISK_ACCESS_DENIED, "Not
allowed to download to "+tempFile+" or "+targetFile + ". You might need to do a
" + TestDDARequestMessage.name + " first.", identifier, global);
ret = new FileBucket(message.tempFile, false, true,
false, false, false);
} else if(returnType == ClientGetMessage.RETURN_TYPE_NONE) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java 2007-04-13 12:50:20 UTC
(rev 12622)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java 2007-04-13 12:57:26 UTC
(rev 12623)
@@ -54,7 +54,7 @@
/** The FCPServer */
final FCPServer server;
/** The current connection handler, if any. */
- protected FCPConnectionHandler currentConnection;
+ private FCPConnectionHandler currentConnection;
/** Currently running persistent requests */
private final HashSet runningPersistentRequests;
/** Completed unacknowledged persistent requests */
