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

[toad at freenetproject.org]

Author: toad
Date: 2007-04-03 16:03:28 +0000 (Tue, 03 Apr 2007)
New Revision: 12536

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
logging (mostly)

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2007-04-03 15:58:50 UTC (rev 12535)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2007-04-03 16:03:28 UTC (rev 12536)
@@ -492,8 +492,10 @@
 		try {
 			atime = environment.openSecondaryDatabase
 								(null, prefix+"CHK_accessTime", chkDB, secDbConfig);
-			if(atime.count() < chkDB.count()) {
-				System.err.println("Access times database: "+atime.count()+" but main database: "+chkDB.count());
+			long chkDBCount = chkDB.count();
+			long atimeCount = atime.count();
+			if(atimeCount < chkDBCount) {
+				System.err.println("Access times database: "+atimeCount+" but main database: "+chkDBCount);
 				throw new DatabaseException("Needs repopulation");
 			}
 		} catch (DatabaseException e) {
@@ -537,7 +539,9 @@
 			System.err.println("Opening block db index");
 			blockNums = environment.openSecondaryDatabase
 				(null, prefix+"CHK_blockNum", chkDB, blockNoDbConfig);
-			if(blockNums.count() < chkDB.count()) {
+			long blockNumsCount = blockNums.count();
+			long chkDBCount = chkDB.count();
+			if(blockNumsCount < chkDBCount) {
 				System.err.println("Block nums database: "+atime.count()+" but main database: "+chkDB.count());
 				throw new DatabaseException("Needs repopulation");
 			}