r26715 - trunk/freenet/src/freenet/node/fcp

Author: toad
Date: 2009-04-10 15:51:17 +0000 (Fri, 10 Apr 2009)
New Revision: 26715

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Remove unneeded code, juggle slightly


Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java	2009-04-10 15:43:54 UTC (rev 26714)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java	2009-04-10 15:51:17 UTC (rev 26715)
@@ -974,22 +974,13 @@
 				boolean done;
 				IdentifierCollisionException collided;
 			}
-			final OutputWrapper ow = new OutputWrapper();
 			if(container != null) {
 				// Don't activate, it may not be stored yet.
-				try {
 					req.register(container, false, false);
 					req.start(container, context);
-				} catch (IdentifierCollisionException e) {
-					ow.collided = e;
-				} finally {
-					synchronized(ow) {
-						ow.done = true;
-						ow.notifyAll();
-					}
-				}
 				container.deactivate(req, 1);
 			} else {
+				final OutputWrapper ow = new OutputWrapper();
 			core.clientContext.jobRunner.queue(new DBJob() {
 				
 				public void run(ObjectContainer container, ClientContext context) {