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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-17 12:16:36 +0000 (Sat, 17 Mar 2007)
New Revision: 12172

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
Fix a potential problem with wrapper timeout

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-17 
12:09:49 UTC (rev 12171)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2007-03-17 
12:16:36 UTC (rev 12172)
@@ -986,7 +986,7 @@
                try {
                        String msg = "Shrinking store: "+curBlocks+" -> 
"+maxBlocks+" (from db "+chkDB.count()+", highest 
"+highestBlockNumberInDatabase()+", from file "+countCHKBlocksFromFile()+ ')';
                        System.err.println(msg); Logger.normal(this, msg);
-               
WrapperManager.signalStarting((int)Math.min(0,(curBlocks-maxBlocks)*100)+5*60*1000);
 // 10 per second plus 5 minutes
+               
WrapperManager.signalStarting((int)Math.max(0,(curBlocks-maxBlocks)*100)+5*60*1000);
 // 0.1s per block plus 5 minutes
                        while(true) {
                                t = environment.beginTransaction(null,null);
                                long deleted = 0;