[freenet-cvs] r13604 - trunk/freenet/src/freenet/support

[t...@freenetproject.org]

Author: toad
Date: 2007-06-15 15:52:29 +0000 (Fri, 15 Jun 2007)
New Revision: 13604

Modified:
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Fix NPE

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-06-15 
15:42:57 UTC (rev 13603)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-06-15 
15:52:29 UTC (rev 13604)
@@ -213,6 +213,7 @@
                String hisVal = (String) fs.values.get(key);
                values.put(key, hisVal); // overwrite old
        }
+       if(fs.subsets == null) return;
        i = fs.subsets.keySet().iterator();
        while(i.hasNext()) {
                String key = (String) i.next();