Author: toad
Date: 2009-02-26 18:30:15 +0000 (Thu, 26 Feb 2009)
New Revision: 25838
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Merge NPE fix from db4o: 25673
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355-25356,25479,25488,25505,25540,25594,25673
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355-25356,25479,25488,25505,25540,25594,25673
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2009-02-26 18:28:21 UTC
(rev 25837)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2009-02-26 18:30:15 UTC
(rev 25838)
@@ -933,7 +933,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
