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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-15 17:27:12 +0000 (Thu, 15 Mar 2007)
New Revision: 12123

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/SSKInsertSender.java
Log:
We know that those values are null ... there is no point in displaying them at 
all.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-03-15 17:18:42 UTC 
(rev 12122)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-03-15 17:27:12 UTC 
(rev 12123)
@@ -786,7 +786,7 @@
                if(localDetectedPeer == null) {
                        localHandshakeIPs = null;
                        synchronized(this) {
-                               handshakeIPs = localHandshakeIPs;
+                               handshakeIPs = null;
                        }
                        if(logMINOR) Logger.minor(this, "1: 
maybeUpdateHandshakeIPs got a result of: "+handshakeIPsToString());
                        return;
@@ -2702,7 +2702,6 @@
                } else if(extraPeerDataType == 
Node.EXTRA_PEER_DATA_TYPE_QUEUED_TO_SEND_N2NTM) {
                        boolean sendSuccess = false;
                        if(isConnected()) {
-                               String text = null;
                                Message n2ntm;
                                if(fs.get("extraPeerDataType") != null) {
                                        fs.removeValue("extraPeerDataType");
@@ -2726,7 +2725,7 @@
                                try {
                                        
synchronized(queuedToSendN2NTMExtraPeerDataFileNumbers) {
                                                node.usm.send(this, n2ntm, 
null);
-                                               Logger.normal(this, "Sent 
queued ("+fileNumber+") N2NTM to '"+getName()+"': "+text);
+                                               Logger.normal(this, "Sent 
queued ("+fileNumber+") N2NTM to '"+getName()+"': "+n2ntm);
                                                sendSuccess = true;
                                                
queuedToSendN2NTMExtraPeerDataFileNumbers.remove(Integer.toString(fileNumber));
                                        }

Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-03-15 17:18:42 UTC 
(rev 12122)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2007-03-15 17:27:12 UTC 
(rev 12123)
@@ -305,8 +305,7 @@
                                if (msg == null) {
                                        // Timeout :(
                                        // Fairly serious problem
-                                       Logger.error(this, "Timeout (" + msg
-                                                       + ") after Accepted in 
insert");
+                                       Logger.error(this, "Timeout (" + next + 
") after Accepted in insert");
                                        // Terminal overload
                                        // Try to propagate back to source
                                        
next.localRejectedOverload("AfterInsertAcceptedTimeout");