Author: toad
Date: 2008-09-01 19:51:19 +0000 (Mon, 01 Sep 2008)
New Revision: 22312
Modified:
branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
In fact, store it after we've checked for collision.
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-09-01 19:49:54 UTC (rev 22311)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-09-01 19:51:19 UTC (rev 22312)
@@ -245,9 +245,9 @@
server.core.clientContext.jobRunner.queue(new DBJob() {
public void
run(ObjectContainer container, ClientContext context) {
-
container.set(getter);
try {
getter.register(container, false, false);
+
container.set(getter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this, "Identifier collision on "+this);
FCPMessage msg = new IdentifierCollisionMessage(id, global);
@@ -313,9 +313,9 @@
server.core.clientContext.jobRunner.queue(new DBJob() {
public void run(ObjectContainer
container, ClientContext context) {
- container.set(putter);
try {
putter.register(container, false, false);
+
container.set(putter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this, "Identifier collision on "+this);
FCPMessage msg
= new IdentifierCollisionMessage(id, global);
@@ -379,9 +379,9 @@
server.core.clientContext.jobRunner.queue(new
DBJob() {
public void run(ObjectContainer
container, ClientContext context) {
- container.set(putter);
try {
putter.register(container, false, false);
+ container.set(putter);
} catch
(IdentifierCollisionException e) {
Logger.normal(this,
"Identifier collision on "+this);
FCPMessage msg = new
IdentifierCollisionMessage(id, global);
