r26838 - trunk/freenet/src/freenet/node/fcp
[email protected] Wed, 15 Apr 2009 11:45:10 +0000
| Newsgroups | gmane.network.freenet.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: toad
Date: 2009-04-15 11:45:09 +0000 (Wed, 15 Apr 2009)
New Revision: 26838
Modified:
trunk/freenet/src/freenet/node/fcp/ClientGet.java
Log:
Fix NPE on RemovePersistentRequest for a connection-persistent request
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2009-04-15 11:41:10 UTC (rev 26837)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2009-04-15 11:45:09 UTC (rev 26838)
@@ -615,9 +615,11 @@
}
// notify client that request was removed
FCPMessage msg = new PersistentRequestRemovedMessage(getIdentifier(), global);
+ if(persistenceType != PERSIST_CONNECTION) {
if(persistenceType == PERSIST_FOREVER)
container.activate(client, 1);
client.queueClientRequestMessage(msg, 0, container);
+ }
freeData(container);