[freenet-cvs] r16794 - trunk/freenet/src/freenet/io/comm

[t...@freenetproject.org]

Author: toad
Date: 2007-12-22 21:46:37 +0000 (Sat, 22 Dec 2007)
New Revision: 16794

Modified:
   trunk/freenet/src/freenet/io/comm/MessageCore.java
Log:
Fix NPE: ALWAYS setMessage() before calling onMatched().

Modified: trunk/freenet/src/freenet/io/comm/MessageCore.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageCore.java  2007-12-22 21:33:57 UTC 
(rev 16793)
+++ trunk/freenet/src/freenet/io/comm/MessageCore.java  2007-12-22 21:46:37 UTC 
(rev 16794)
@@ -344,6 +344,7 @@
                        }
                }
                if(ret != null) {
+                       filter.setMessage(ret);
                        filter.onMatched();
                        filter.clearMatched();
                }
@@ -444,6 +445,7 @@
                        if(logDEBUG) Logger.debug(this, "Returning "+ret+" from 
"+filter);
                } else {
                        // Matched an unclaimed packet
+                       filter.setMessage(ret);
                        filter.onMatched();
                        filter.clearMatched();
                }