[freenet-cvs] r8978 - in trunk/freenet/src/freenet: clients/http node

[t...@freenetproject.org]

Author: toad
Date: 2006-06-02 00:42:36 +0000 (Fri, 02 Jun 2006)
New Revision: 8978

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
   trunk/freenet/src/freenet/node/Version.java
Log:
770: Fix an NPE.

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-06-02 
00:38:42 UTC (rev 8977)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java   2006-06-02 
00:42:36 UTC (rev 8978)
@@ -406,11 +406,14 @@
                String fnam = sanitize(uri.getDocName());
                if(fnam != null && fnam.length() > 0) return fnam;
                String[] meta = uri.getAllMetaStrings();
-               for(int i=meta.length-1;i>=0;i++) {
-                       String s = meta[i];
-                       if(s.length() == 0) continue;
-                       fnam = sanitize(s);
-                       if(s != null && s.length() > 0) return fnam;
+               if(meta != null) {
+                       for(int i=meta.length-1;i>=0;i++) {
+                               String s = meta[i];
+                               if(s == null) continue;
+                               if(s.length() == 0) continue;
+                               fnam = sanitize(s);
+                               if(s != null && s.length() > 0) return fnam;
+                       }
                }
                return Base64.encode(uri.getRoutingKey());
        }

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-06-02 00:38:42 UTC (rev 
8977)
+++ trunk/freenet/src/freenet/node/Version.java 2006-06-02 00:42:36 UTC (rev 
8978)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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