Author: toad
Date: 2008-12-03 00:01:01 +0000 (Wed, 03 Dec 2008)
New Revision: 24023
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Only inherit previousTracker if it's not deprecated.
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-12-02 23:41:15 UTC
(rev 24022)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-12-03 00:01:01 UTC
(rev 24023)
@@ -1901,12 +1901,9 @@
this.offeredMainJarVersion = 0;
} else {
// else it's a rekey
- if(currentTracker != null &&
currentTracker.packets.isDeprecated()) {
- packets = new PacketTracker(this);
- newPacketTracker = true;
- } else if(currentTracker != null && negType >=
3)
+ if(currentTracker != null &&
!currentTracker.packets.isDeprecated() && negType >= 3)
packets = currentTracker.packets;
- else if(previousTracker != null && negType >= 3)
+ else if(previousTracker != null &&
!previousTracker.packets.isDeprecated() && negType >= 3)
packets = previousTracker.packets;
else {
packets = new PacketTracker(this);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
