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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-27 10:38:51 +0000 (Fri, 27 Jun 2008)
New Revision: 20812

Modified:
   branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
Log:
Don't deactivate the keys, we may need them

Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-06-27 10:32:31 UTC (rev 20811)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2008-06-27 10:38:51 UTC (rev 20812)
@@ -705,8 +705,7 @@
                                sub.add(i, true, container, context);
                                if(!v.contains(sub)) v.add(sub);
                                notFound = false;
-                       } else
-                               container.deactivate(k, 5);
+                       }
                }
                for(int i=0;i<checkKeys.length;i++) {
                        if(checkKeys[i] == null) continue;
@@ -727,8 +726,7 @@
                                sub.add(i+dataKeys.length, true, container, 
context);
                                if(!v.contains(sub)) v.add(sub);
                                notFound = false;
-                       } else
-                               container.deactivate(k, 5);
+                       }
                }
                }
                if(notFound) {
@@ -749,8 +747,7 @@
                                container.activate(k, 5);
                        if(k.getNodeKey().equals(key)) {
                                return dataCooldownTimes[i];
-                       } else
-                               container.deactivate(k, 5);
+                       }
                }
                for(int i=0;i<checkKeys.length;i++) {
                        if(checkKeys[i] == null) continue;
@@ -759,8 +756,7 @@
                                container.activate(k, 5);
                        if(checkKeys[i].getNodeKey().equals(key)) {
                                return checkCooldownTimes[i];
-                       } else
-                               container.deactivate(k, 5);
+                       }
                }
                return -1;
        }
@@ -772,7 +768,6 @@
                        if(persistent)
                                container.activate(k, 5);
                        if(k.equals(key)) return i;
-                       else container.deactivate(k, 5);
                }
                for(int i=0;i<checkKeys.length;i++) {
                        ClientKey k = checkKeys[i];
@@ -780,7 +775,6 @@
                        if(persistent)
                                container.activate(k, 5);
                        if(k.equals(key)) return dataKeys.length+i;
-                       else container.deactivate(k, 5);
                }
                return -1;
        }