[freenet-cvs] r15508 - trunk/freenet/src/freenet/node

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-10-23 18:04:43 +0000 (Tue, 23 Oct 2007)
New Revision: 15508

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
doh

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java	2007-10-23 17:55:08 UTC (rev 15507)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java	2007-10-23 18:04:43 UTC (rev 15508)
@@ -2480,8 +2480,9 @@
 		node.executor.execute(new Runnable() {
 			public void run() {
 				synchronized (dhContextFIFO) {
-					dhContextFIFO.remove(findOldestContext());
 					dhContextFIFO.addLast(_genLightDiffieHellmanContext());
+					if(dhContextFIFO.size() > DH_CONTEXT_BUFFER_SIZE)
+						dhContextFIFO.remove(findOldestContext());
 				}
 			}
 		}, "DiffieHellman exponential signing");
@@ -2497,10 +2498,7 @@
 	 */
 	private DiffieHellmanLightContext getLightDiffieHellmanContext() {
 		final long now = System.currentTimeMillis();
-		
 		int dhContextFIFOSize = 0;
-		boolean requeueElement = true;
-		
 		DiffieHellmanLightContext result = null;
 		
 		synchronized (dhContextFIFO) {
@@ -2519,13 +2517,11 @@
 				// Shall we replace one element of the queue ?
 				if((jfkDHLastGenerationTimestamp + 30000 /*30sec*/) < now) {
 					jfkDHLastGenerationTimestamp = now;
-					requeueElement = false;
 					_fillJFKDHFIFO();
 				}
 			}
 			
-			if(requeueElement)
-				dhContextFIFO.addLast(result);
+			dhContextFIFO.addLast(result);
 		}
 		
 		Logger.minor(this, "getLightDiffieHellmanContext() is serving "+result.hashCode());