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

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-03-24 02:17:08 +0000 (Mon, 24 Mar 2008)
New Revision: 18732

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix the handshaking logic... the node was broken !

mars 24, 2008 02:05:11:094 (freenet.io.comm.UdpSocketHandler, UdpSocketHandler for port 50289(2), ERROR): Caught java.lang.NullPointerException from freenet.node.FNPPacketMangler at b01d43
java.lang.NullPointerException
        at freenet.node.PeerNode.maybeSwapTrackers(PeerNode.java:1931)
        at freenet.node.PeerNode.completedHandshake(PeerNode.java:1870)
        at freenet.node.FNPPacketMangler.processJFKMessage4(FNPPacketMangler.java:1349)
        at freenet.node.FNPPacketMangler.processDecryptedAuthAnonReply(FNPPacketMangler.java:598)
        at freenet.node.FNPPacketMangler.tryProcessAuthAnonReply(FNPPacketMangler.java:503)
        at freenet.node.FNPPacketMangler.process(FNPPacketMangler.java:285)


Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java	2008-03-23 16:25:31 UTC (rev 18731)
+++ trunk/freenet/src/freenet/node/PeerNode.java	2008-03-24 02:17:08 UTC (rev 18732)
@@ -1928,6 +1928,7 @@
 	 * greater than previous's.
 	 */
 	private synchronized void maybeSwapTrackers() {
+		if(currentTracker == null || previousTracker == null) return;
 		long delta = Math.abs(currentTracker.createdTime - previousTracker.createdTime);
 		if(previousTracker != null && (!previousTracker.isDeprecated()) &&
 				delta < CHECK_FOR_SWAPPED_TRACKERS_INTERVAL) {