Author: nextgens
Date: 2008-04-04 05:53:39 +0000 (Fri, 04 Apr 2008)
New Revision: 18973
Modified:
trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
r18971 was silly, it will throw a NPE anyway.
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-04-04
05:45:55 UTC (rev 18972)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-04-04
05:53:39 UTC (rev 18973)
@@ -1595,13 +1595,11 @@
if(logMINOR) {
long now = System.currentTimeMillis();
String delta = "never";
- if(pn != null) {
- long last = pn.lastSentPacketTime();
- delta = TimeUtil.formatTime(now-last, 2,
true)+" ago";
- }
- Logger.minor(this, "Sending auth packet for "+(pn ==
null ? "null" : String.valueOf(pn.getPeer()))+" (phase="+phase+",
ver="+version+", nt="+negType+") (last packet sent "+delta+") to "+replyTo+"
data.length="+data.length+" to "+replyTo);
+ long last = pn.lastSentPacketTime();
+ delta = TimeUtil.formatTime(now - last, 2, true) + "
ago";
+ Logger.minor(this, "Sending auth packet for "+
String.valueOf(pn.getPeer())+" (phase="+phase+", ver="+version+",
nt="+negType+") (last packet sent "+delta+") to "+replyTo+"
data.length="+data.length+" to "+replyTo);
}
- sendAuthPacket(output, (pn == null ? null :
pn.outgoingSetupCipher), pn, replyTo, false);
+ sendAuthPacket(output, pn.outgoingSetupCipher, pn, replyTo,
false);
}
/**
