[freenet-cvs] r22081 - trunk/freenet/src/freenet/keys

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-08-22 07:27:32 +0000 (Fri, 22 Aug 2008)
New Revision: 22081

Modified:
   trunk/freenet/src/freenet/keys/FreenetURI.java
Log:
check null before dereference

Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java      2008-08-22 06:34:38 UTC 
(rev 22080)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java      2008-08-22 07:27:32 UTC 
(rev 22081)
@@ -16,6 +16,7 @@
 import java.util.StringTokenizer;
 import java.util.Vector;

+import freenet.client.InsertException;
 import freenet.support.Base64;
 import freenet.support.Fields;
 import freenet.support.HexUtil;
@@ -25,7 +26,6 @@
 import freenet.support.URLEncodedFormatException;
 import freenet.support.URLEncoder;
 import freenet.support.io.FileUtil;
-import freenet.client.InsertException;

 /**
  * Note that the metadata pairs below are not presently supported. They are 
supported
@@ -442,10 +442,12 @@
         */
        public FreenetURI popMetaString() {
                String[] newMetaStr = null;
-               final int metaStrLength = metaStr.length;
-               if((metaStr != null) && (metaStrLength > 1)) {
-                       newMetaStr = new String[metaStrLength - 1];
-                       System.arraycopy(metaStr, 1, newMetaStr, 0, 
newMetaStr.length);
+               if (metaStr != null) {
+                       final int metaStrLength = metaStr.length;
+                       if (metaStrLength > 1) {
+                               newMetaStr = new String[metaStrLength - 1];
+                               System.arraycopy(metaStr, 1, newMetaStr, 0, 
newMetaStr.length);
+                       }
                }
                return setMetaString(newMetaStr);
        }