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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-24 12:40:22 +0000 (Tue, 24 Apr 2007)
New Revision: 12918

Modified:
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Doh - fix NPE in KeyIterator init

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-04-24 
11:49:52 UTC (rev 12917)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-04-24 
12:40:22 UTC (rev 12918)
@@ -444,8 +444,8 @@
                        else
                                subsetIterator = null;
                        while(true) {
-                               if(valuesIterator.hasNext()) break;
-                               if(!subsetIterator.hasNext()) break;
+                               if(valuesIterator != null && 
valuesIterator.hasNext()) break;
+                               if(subsetIterator == null || 
!subsetIterator.hasNext()) break;
                                String name = (String) subsetIterator.next();
                                if(name == null) continue;
                                SimpleFieldSet fs = (SimpleFieldSet) 
subsets.get(name);