[freenet-cvs] r10978 - trunk/freenet/src/freenet/store

[t...@freenetproject.org]

Author: toad
Date: 2006-11-17 23:15:28 +0000 (Fri, 17 Nov 2006)
New Revision: 10978

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
WrapperManager.signalStarting is apparently not *added* to the timeout, it 
*sets* the timeout.

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-17 
22:53:35 UTC (rev 10977)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-17 
23:15:28 UTC (rev 10978)
@@ -592,7 +592,7 @@

        private long checkForHoles(long blocksInFile, boolean dontTruncate) 
throws DatabaseException {
                System.err.println("Checking for holes in database...");
-               WrapperManager.signalStarting((int)blocksInFile*100); // 10/sec
+               WrapperManager.signalStarting(5*60*1000 + 
(int)blocksInFile*100); // 10/sec
                long holes = 0;
                long maxPresent = 0;
                freeBlocks.clear();
@@ -662,7 +662,7 @@

        checkForHoles(maxChkBlocks, true);

-       WrapperManager.signalStarting((int)chkBlocksInStore * 100); // 10 per 
second
+       WrapperManager.signalStarting(5*60*1000 + (int)chkBlocksInStore * 100); 
// 10 per second

        long realSize = countCHKBlocksFromFile();

@@ -774,7 +774,7 @@

        // Now move all the wantedMove blocks onto the corresponding 
unwantedMove's.

-       WrapperManager.signalStarting(wantedMoveNums.length*1000); // 1 per 
second
+       WrapperManager.signalStarting(5*60*1000 + wantedMoveNums.length*1000); 
// 1 per second

        byte[] buf = new byte[headerBlockSize + dataBlockSize];
        t = null;