[freenet-cvs] r14525 - trunk/freenet/src/freenet/client

[t...@freenetproject.org]

Author: toad
Date: 2007-08-08 17:07:04 +0000 (Wed, 08 Aug 2007)
New Revision: 14525

Modified:
   trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Don't trimStoredData() until we've had a chance to pass the bucket on to the 
client

Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java        2007-08-08 
16:55:25 UTC (rev 14524)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java        2007-08-08 
17:07:04 UTC (rev 14525)
@@ -261,6 +261,7 @@
                                                
callback.gotBucket(item.getReaderBucket());
                                        }
                                        names.add(name);
+                                       trimStoredData();
                                }
                        }

@@ -272,6 +273,7 @@
                                        // Let it throw, if it does something 
is drastically wrong
                                        
callback.gotBucket(item.getReaderBucket());
                                }
+                               trimStoredData();
                        }
                        if(throwAtExit) throw new 
ArchiveRestartException("Archive changed on re-fetch");

@@ -415,7 +417,6 @@
                }
                if(oldItem != null)
                        oldItem.close();
-               trimStoredData();
                return element;
        }