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

[t...@freenetproject.org]

Author: toad
Date: 2006-11-28 18:02:13 +0000 (Tue, 28 Nov 2006)
New Revision: 11089

Modified:
   trunk/freenet/src/freenet/node/FNPPacketMangler.java
   trunk/freenet/src/freenet/node/MessageItem.java
Log:
And another one (fix NPE)

Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-11-28 
17:58:49 UTC (rev 11088)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java        2006-11-28 
18:02:13 UTC (rev 11089)
@@ -912,7 +912,7 @@
                String mi_name = null;
         for(int i=0;i<messageData.length;i++) {
             MessageItem mi = messages[i];
-               if(logMINOR) Logger.minor(this, "Handling formatted MessageItem 
"+mi+" : "+mi.buf.length);
+               if(logMINOR) Logger.minor(this, "Handling formatted MessageItem 
"+mi+" : "+mi.getData(pn).length);
                        mi_name = (mi.msg == null ? "(not a Message)" : 
mi.msg.getSpec().getName());
             if(mi.formatted) {
                 try {

Modified: trunk/freenet/src/freenet/node/MessageItem.java
===================================================================
--- trunk/freenet/src/freenet/node/MessageItem.java     2006-11-28 17:58:49 UTC 
(rev 11088)
+++ trunk/freenet/src/freenet/node/MessageItem.java     2006-11-28 18:02:13 UTC 
(rev 11089)
@@ -35,6 +35,8 @@
         this.msg = null;
         this.buf = data;
         this.formatted = formatted;
+        if(formatted && buf == null)
+               throw new NullPointerException();
         this.ctrCallback = ctr;
         this.submitted = System.currentTimeMillis();
     }