r26875 - trunk/freenet/src/freenet/client/async

[email protected] Thu, 16 Apr 2009 04:42:40 +0000
Newsgroups gmane.network.freenet.cvs
Message-ID <[email protected]>
Author: j16sdiz
Date: 2009-04-16 04:42:39 +0000 (Thu, 16 Apr 2009)
New Revision: 26875

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Generic-related warnings (ClientRequestSchedulerCore)

Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java	2009-04-16 04:42:16 UTC (rev 26874)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java	2009-04-16 04:42:39 UTC (rev 26875)
@@ -68,7 +68,7 @@
 	 * we'd move this to node but only track keys we are fetching at max HTL.
 	 * LOCKING: Always lock this LAST.
 	 */
-	private transient HashSet keysFetching;
+	private transient HashSet<Key> keysFetching;
 	
 	private static class RunningTransientInsert {
 		
@@ -156,7 +156,7 @@
 		this.initTime = System.currentTimeMillis();
 		// We DO NOT want to rerun the query after consuming the initial set...
 		if(!isInsertScheduler) {
-			keysFetching = new HashSet();
+			keysFetching = new HashSet<Key>();
 			runningTransientInserts = null;
 			this.recentSuccesses = new ArrayList<RandomGrabArray>();
 		} else {
@@ -499,11 +499,11 @@
 				 * Probably this is acceptable.
 				 */
 				if(!req.persistent() && !isInsertScheduler) {
-					List recent = schedTransient.recentSuccesses;
-					SendableRequest altReq = null;
+					List<BaseSendableGet> recent = schedTransient.recentSuccesses;
+					BaseSendableGet altReq = null;
 					if(!recent.isEmpty()) {
 						if(random.nextBoolean()) {
-							altReq = (BaseSendableGet) recent.remove(recent.size()-1);
+							altReq = recent.remove(recent.size()-1);
 						}
 					}
 					if(altReq != null && (altReq.isCancelled(container) || altReq.isEmpty(container))) {