Author: nextgens
Date: 2006-02-22 16:09:17 +0000 (Wed, 22 Feb 2006)
New Revision: 8110

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
Log:
fix mentalsurge's NPE

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-02-22 15:48:28 UTC (rev 
8109)
+++ trunk/freenet/src/freenet/node/Version.java 2006-02-22 16:09:17 UTC (rev 
8110)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 464;
+       private static final int buildNumber = 465;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 403;

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2006-02-22 15:48:28 UTC (rev 8109)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionInputHandler.java   
2006-02-22 16:09:17 UTC (rev 8110)
@@ -44,7 +44,7 @@
                        SimpleFieldSet fs;
                        // Read a message
                        String messageType = lis.readLine(64, 64);
-                       if(messageType.equals("")) continue;
+                       if(messageType==null || messageType.equals("")) 
continue;
                        fs = new SimpleFieldSet(lis, 4096, 128, false, false);
                        FCPMessage msg;
                        try {


Reply via email to