[freenet-cvs] r12816 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2007-04-20 16:02:57 +0000 (Fri, 20 Apr 2007)
New Revision: 12816

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
Log:
Maybe fix NPE?

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2007-04-20 15:53:03 UTC (rev 12815)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2007-04-20 16:02:57 UTC (rev 12816)
@@ -59,7 +59,7 @@
                        fs = new SimpleFieldSet(lis, 4096, 128, true, true, 
true, true);

                        // check for valid endmarker
-                       if ((!fs.getEndMarker().startsWith("End")) && 
(!"Data".equals(fs.getEndMarker()))) {
+                       if (fs.getEndMarker() != null && 
(!fs.getEndMarker().startsWith("End")) && (!"Data".equals(fs.getEndMarker()))) {
                                FCPMessage err = new 
ProtocolErrorMessage(ProtocolErrorMessage.MESSAGE_PARSE_ERROR, false, "Invalid 
end marker: "+fs.getEndMarker(), fs.get("Identifer"), false);
                                handler.outputHandler.queue(err);
                                continue;