Author: toad
Date: 2008-12-19 19:51:22 +0000 (Fri, 19 Dec 2008)
New Revision: 24636
Modified:
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Fix NPE
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-19
19:48:00 UTC (rev 24635)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-12-19
19:51:22 UTC (rev 24636)
@@ -486,7 +486,12 @@
}
if(persistenceType == PERSIST_FOREVER)
container.activate(client, 1);
- client.queueClientRequestMessage(msg,
VERBOSITY_SPLITFILE_PROGRESS, container);
+ if(persistenceType == PERSIST_CONNECTION && handler == null)
+ handler = origHandler.outputHandler;
+ if(handler != null) {
+ handler.queue(msg);
+ } else
+ client.queueClientRequestMessage(msg,
VERBOSITY_SPLITFILE_PROGRESS, container);
if(persistenceType == PERSIST_FOREVER && !client.isGlobalQueue)
container.deactivate(client, 1);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
