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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-16 22:06:41 +0000 (Wed, 16 Jul 2008)
New Revision: 21151

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
No point deactivating it if we've deleted it.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-16 22:06:23 UTC (rev 21150)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-16 22:06:41 UTC (rev 21151)
@@ -896,11 +896,12 @@
                                        if(logMINOR)
                                                Logger.minor(this, "Deleting 
"+req);
                                        
selectorContainer.delete((PersistentChosenRequest)req);
+                               } else {
+                                       selectorContainer.deactivate(req, 1);
                                }
-                               selectorContainer.deactivate(req, 1);
                        }

-               }, NativeThread.NORM_PRIORITY, false);
+               }, prio, false);
        }

        public void callFailure(final SendableInsert put, final 
LowLevelPutException e, final Object keyNum, int prio, final ChosenRequest req, 
boolean persistent) {
@@ -917,8 +918,9 @@
                                        if(logMINOR)
                                                Logger.minor(this, "Deleting 
"+req);
                                        
selectorContainer.delete((PersistentChosenRequest)req);
+                               } else {
+                                       selectorContainer.deactivate(put, 1);
                                }
-                               selectorContainer.deactivate(put, 1);
                        }

                }, NativeThread.NORM_PRIORITY, false);