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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-27 16:04:08 +0000 (Wed, 27 Aug 2008)
New Revision: 22188

Modified:
   
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
Activation


Modified: 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-08-27 16:03:42 UTC (rev 22187)
+++ 
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java  
    2008-08-27 16:04:08 UTC (rev 22188)
@@ -835,9 +835,16 @@

        @Override
        public Key[] listKeys(ObjectContainer container) {
-               if(persistent)
-                       container.activate(segment, 1);
-               return segment.listKeys(container);
+               boolean activated = false;
+               if(persistent) {
+                       activated = container.ext().isActive(segment);
+                       if(!activated)
+                               container.activate(segment, 1);
+               }
+               Key[] keys = segment.listKeys(container);
+               if(persistent && !activated)
+                       container.deactivate(segment, 1);
+               return keys;
        }

 }