Author: toad
Date: 2009-02-17 23:13:58 +0000 (Tue, 17 Feb 2009)
New Revision: 25673
Modified:
branches/db4o/freenet/src/freenet/node/PeerNode.java
Log:
Fix NPE at minor logging. REQUEST BACKPORT.
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2009-02-17
23:13:19 UTC (rev 25672)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2009-02-17
23:13:58 UTC (rev 25673)
@@ -925,7 +925,8 @@
updateShortToString();
}
if(logMINOR) {
- Logger.minor(this, "3: detectedPeer = " +
localDetectedPeer + " (" + localDetectedPeer.getAddress(false) + ')');
+ if(localDetectedPeer != null)
+ Logger.minor(this, "3: detectedPeer = " +
localDetectedPeer + " (" + localDetectedPeer.getAddress(false) + ')');
Logger.minor(this, "3: maybeUpdateHandshakeIPs got a
result of: " + handshakeIPsToString());
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs