Author: toad
Date: 2008-12-23 14:35:52 +0000 (Tue, 23 Dec 2008)
New Revision: 24767
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Fix ClientGet NPE
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
14:33:49 UTC (rev 24766)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-23
14:35:52 UTC (rev 24767)
@@ -469,13 +469,17 @@
private void trySendAllDataMessage(AllDataMessage msg,
FCPConnectionOutputHandler handler, ObjectContainer container) {
if(persistenceType != ClientRequest.PERSIST_CONNECTION) {
allDataPending = msg;
- if(persistenceType == ClientRequest.PERSIST_FOREVER)
+ if(persistenceType == ClientRequest.PERSIST_FOREVER) {
+ container.activate(client, 1);
container.store(this);
- } else {
- if(persistenceType == PERSIST_FOREVER)
- container.activate(client, 1);
+ }
+ }
+ if(persistenceType == PERSIST_CONNECTION && handler == null)
+ handler = origHandler.outputHandler;
+ if(handler != null)
+ handler.queue(msg);
+ else
client.queueClientRequestMessage(msg, 0, container);
- }
}
private void trySendProgress(SimpleProgressMessage msg,
FCPConnectionOutputHandler handler, ObjectContainer container) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
