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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-17 11:50:40 +0000 (Thu, 17 Jul 2008)
New Revision: 21159

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
If we are here, it *is* persistent.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-17 11:48:00 UTC (rev 21158)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-17 11:50:40 UTC (rev 21159)
@@ -896,13 +896,9 @@
                                if(logMINOR)
                                        Logger.minor(this, "callFailure() on 
"+get+" : "+e);
                                get.onFailure(e, keyNum, selectorContainer, 
clientContext);
-                               if(get.persistent()) {
-                                       if(logMINOR)
-                                               Logger.minor(this, "Deleting 
"+req);
-                                       
selectorContainer.delete((PersistentChosenRequest)req);
-                               } else {
-                                       selectorContainer.deactivate(req, 1);
-                               }
+                               if(logMINOR)
+                                       Logger.minor(this, "Deleting "+req);
+                               
selectorContainer.delete((PersistentChosenRequest)req);
                        }

                }, prio, false);
@@ -918,13 +914,9 @@
                        public void run(ObjectContainer container, 
ClientContext context) {
                                container.activate(put, 1);
                                put.onFailure(e, keyNum, selectorContainer, 
clientContext);
-                               if(put.persistent()) {
-                                       if(logMINOR)
-                                               Logger.minor(this, "Deleting 
"+req);
-                                       
selectorContainer.delete((PersistentChosenRequest)req);
-                               } else {
-                                       selectorContainer.deactivate(put, 1);
-                               }
+                               if(logMINOR)
+                                       Logger.minor(this, "Deleting "+req);
+                               
selectorContainer.delete((PersistentChosenRequest)req);
                        }

                }, NativeThread.NORM_PRIORITY, false);
@@ -940,12 +932,9 @@
                        public void run(ObjectContainer container, 
ClientContext context) {
                                container.activate(put, 1);
                                put.onSuccess(keyNum, selectorContainer, 
clientContext);
-                               if(put.persistent()) {
-                                       if(logMINOR)
-                                               Logger.minor(this, "Deleting 
"+req);
-                                       
selectorContainer.delete((PersistentChosenRequest)req);
-                               }
-                               selectorContainer.deactivate(put, 1);
+                               if(logMINOR)
+                                       Logger.minor(this, "Deleting "+req);
+                               
selectorContainer.delete((PersistentChosenRequest)req);
                        }

                }, NativeThread.NORM_PRIORITY+1, false);