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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-04-28 15:45:40 +0000 (Mon, 28 Apr 2008)
New Revision: 19588

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
Log:
Add some logging to trace a weird NPE down

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-04-28 
15:09:28 UTC (rev 19587)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2008-04-28 
15:45:40 UTC (rev 19588)
@@ -1134,11 +1134,14 @@
                // construct the peernode
                if(unknownInitiator) {
                        pn = getPeerNodeFromUnknownInitiator(hisRef, setupType, 
pn);
-                       if(pn == null) {
+               }
+               if(pn == null) {
+                       if(unknownInitiator)
                                // Reject
                                Logger.normal(this, "Rejecting... unable to 
construct PeerNode");
-                               return;
-                       }
+                       else
+                               Logger.error(this, "PeerNode is null and 
unknownInitiator is false!");
+                       return;
                }

                // verify the signature
@@ -1593,6 +1596,7 @@
         * Send an auth packet.
         */
        private void sendAuthPacket(int version, int negType, int phase, byte[] 
data, PeerNode pn, Peer replyTo) {
+               if(pn == null) throw new IllegalArgumentException("pn shouldn't 
be null here!");
                byte[] output = new byte[data.length+3];
                output[0] = (byte) version;
                output[1] = (byte) negType;