[freenet-cvs] r21112 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-07-12 16:55:40 +0000 (Sat, 12 Jul 2008)
New Revision: 21112

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
   branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
Log:
Bugfixes to registerme for inserts changes

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-12 16:44:19 UTC (rev 21111)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-12 16:55:40 UTC (rev 21112)
@@ -173,6 +173,7 @@
                                                }

                                        }, NativeThread.NORM_PRIORITY, false);
+                                       return;
                                }
                                schedCore.innerRegister(req, random, 
selectorContainer);
                        } else {

Modified: 
branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-07-12 16:44:19 UTC (rev 21111)
+++ branches/db4o/freenet/src/freenet/client/async/SingleBlockInserter.java     
2008-07-12 16:55:40 UTC (rev 21112)
@@ -199,7 +199,7 @@
                }
                if(persistent)
                        container.set(this);
-               getScheduler(context).registerInsert(this, persistent, true);
+               getScheduler(context).registerInsert(this, persistent, false, 
true);
        }

        private void fail(InsertException e, ObjectContainer container, 
ClientContext context) {
@@ -263,7 +263,7 @@
                        if(persistent)
                                container.set(this);
                } else {
-                       getScheduler(context).registerInsert(this, persistent, 
true);
+                       getScheduler(context).registerInsert(this, persistent, 
true, true);
                }
        }