r27138 - in trunk/freenet/src/freenet: client/async support/io

[email protected] Tue, 21 Apr 2009 09:15:32 +0000
Newsgroups gmane.network.freenet.cvs
Message-ID <[email protected]>
Author: j16sdiz
Date: 2009-04-21 09:15:32 +0000 (Tue, 21 Apr 2009)
New Revision: 27138

Modified:
   trunk/freenet/src/freenet/client/async/PersistentChosenRequest.java
   trunk/freenet/src/freenet/support/io/BucketChainBucket.java
Log:
unused variable / unreachable code

Modified: trunk/freenet/src/freenet/client/async/PersistentChosenRequest.java
===================================================================
--- trunk/freenet/src/freenet/client/async/PersistentChosenRequest.java	2009-04-21 07:55:52 UTC (rev 27137)
+++ trunk/freenet/src/freenet/client/async/PersistentChosenRequest.java	2009-04-21 09:15:32 UTC (rev 27138)
@@ -285,10 +285,7 @@
 		}
 	}
 
-	public void pruneDuplicates(ClientRequestScheduler sched) {
-		ArrayList<PersistentChosenBlock> dumped = null;
-		try {
-			synchronized(this) {
+	public synchronized void pruneDuplicates(ClientRequestScheduler sched) {
 				for(int i=0;i<blocksNotStarted.size();i++) {
 					PersistentChosenBlock block = blocksNotStarted.get(i);
 					Key key = block.key;
@@ -299,12 +296,5 @@
 						i--;
 					}
 				}
-			}
-		} finally {
-			if(dumped != null) {
-				for(PersistentChosenBlock block : dumped)
-					block.onDumped();
-			}
-		}
 	}
 }

Modified: trunk/freenet/src/freenet/support/io/BucketChainBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketChainBucket.java	2009-04-21 07:55:52 UTC (rev 27137)
+++ trunk/freenet/src/freenet/support/io/BucketChainBucket.java	2009-04-21 09:15:32 UTC (rev 27138)
@@ -298,8 +298,6 @@
 		}
 		return bucket.getOutputStream();
 	}
-
-	private int storedTo = 0;
 	
 	public boolean isReadOnly() {
 		return readOnly;