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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-13 13:02:14 +0000 (Thu, 13 Mar 2008)
New Revision: 18504

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Fix NPE

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-13 
03:51:27 UTC (rev 18503)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-03-13 
13:02:14 UTC (rev 18504)
@@ -1589,10 +1589,11 @@
                System.arraycopy(data, 0, output, 3, data.length);
                if(logMINOR) {
                        long now = System.currentTimeMillis();
-                       long last = pn.lastSentPacketTime();
                        String delta = "never";
-                       if (last>0)
+                       if(pn != null) {
+                               long last = pn.lastSentPacketTime();
                                delta = TimeUtil.formatTime(now-last, 2, 
true)+" ago";
+                       }
                        Logger.minor(this, "Sending auth packet for 
"+pn.getPeer()+" (phase="+phase+", ver="+version+", nt="+negType+") (last 
packet sent "+delta+") to "+replyTo+" data.length="+data.length);
                }
                sendAuthPacket(output, pn.outgoingSetupCipher, pn, replyTo, 
false);