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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-01-21 12:16:57 +0000 (Mon, 21 Jan 2008)
New Revision: 17179

Modified:
   trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
trivial

Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-01-21 12:15:59 UTC (rev 17178)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-01-21 12:16:57 UTC (rev 17179)
@@ -4,7 +4,6 @@
 import java.io.EOFException;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.RandomAccessFile;
@@ -568,12 +567,12 @@
 			Runnable r = new Runnable() {
 				public void run() {
 					try {
-						synchronized(shrinkLock) { if(shrinking) return; shrinking = true; };
+						synchronized(shrinkLock) { if(shrinking) return; shrinking = true; }
 						maybeQuickShrink(false);
 					} catch (Throwable t) {
 						Logger.error(this, "Online shrink failed: "+t, t);
 					} finally {
-						synchronized(shrinkLock) { shrinking = false; };
+						synchronized(shrinkLock) { shrinking = false; }
 					}
 				}
 			};
@@ -833,7 +832,7 @@
 		System.out.println("Completing shrink"); // FIXME remove
 		
 		int totalUnwantedBlocks = unwantedMoveNums.length+freeEarlySlots.length;
-		WrapperManager.signalStarting((int)Math.min(Integer.MAX_VALUE, 5*60*1000 + (totalUnwantedBlocks-wantedMoveNums.length) * 100));
+		WrapperManager.signalStarting(Math.min(Integer.MAX_VALUE, 5*60*1000 + (totalUnwantedBlocks-wantedMoveNums.length) * 100));
 		// If there are any slots left over, they must be free.
 		freeBlocks.clear();
 		t = environment.beginTransaction(null,null);
@@ -1491,7 +1490,7 @@
 				
 		} catch(Throwable ex) {  // FIXME: ugly
 			if(t!=null){
-				try{t.abort();}catch(DatabaseException ex2){};
+				try{t.abort();}catch(DatabaseException ex2){}
 			}
 			checkSecondaryDatabaseError(ex);
 			Logger.error(this, "Caught "+ex, ex);