r26616 - trunk/freenet/src/freenet/node/fcp

Author: toad
Date: 2009-04-07 20:46:46 +0000 (Tue, 07 Apr 2009)
New Revision: 26616

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
Fix Persistence=reboot


Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-07 20:45:21 UTC (rev 26615)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java	2009-04-07 20:46:46 UTC (rev 26616)
@@ -277,6 +277,12 @@
 				}
 			}
 		}
+		if(message.persistenceType == ClientRequest.PERSIST_REBOOT)
+			try {
+				cg.register(null, false, false);
+			} catch (IdentifierCollisionException e) {
+				success = false;
+			}
 		if(!success) {
 			Logger.normal(this, "Identifier collision on "+this);
 			FCPMessage msg = new IdentifierCollisionMessage(id, message.global);
@@ -343,6 +349,12 @@
 				failedMessage = new IdentifierCollisionMessage(id, message.global);
 			}
 		}
+		if(message.persistenceType == ClientRequest.PERSIST_REBOOT)
+			try {
+				cp.register(null, false, false);
+			} catch (IdentifierCollisionException e) {
+				failedMessage = new IdentifierCollisionMessage(id, message.global);
+			}
 		if(failedMessage != null) {
 			outputHandler.queue(failedMessage);
 			if(persistent) {
@@ -427,6 +439,13 @@
 				failedMessage = new IdentifierCollisionMessage(id, message.global);
 			}
 		}
+		
+		if(message.persistenceType == ClientRequest.PERSIST_REBOOT)
+			try {
+				cp.register(null, false, false);
+			} catch (IdentifierCollisionException e) {
+				failedMessage = new IdentifierCollisionMessage(id, message.global);
+			}
 		if(failedMessage != null) {
 			outputHandler.queue(failedMessage);
 			if(cp != null)