r26617 - trunk/freenet/src/freenet/node/fcp

Author: toad
Date: 2009-04-07 21:58:35 +0000 (Tue, 07 Apr 2009)
New Revision: 26617

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
Run freeData on the database thread only if PERSIST_FOREVER


Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-07 20:46:46 UTC (rev 26616)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-07 21:58:35 UTC (rev 26617)
@@ -357,8 +357,9 @@
 			}
 		if(failedMessage != null) {
 			outputHandler.queue(failedMessage);
-			if(persistent) {
+			if(persistent && message.persistenceType == ClientRequest.PERSIST_FOREVER) {
 				final ClientPut c = cp;
+				// Run on the database thread if persistent because it will try to activate stuff...
 				server.core.clientContext.jobRunner.queue(new DBJob() {
 
 					public void run(ObjectContainer container, ClientContext context) {