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

[t...@freenetproject.org]

Author: toad
Date: 2007-04-24 11:39:40 +0000 (Tue, 24 Apr 2007)
New Revision: 12914

Modified:
   trunk/freenet/src/freenet/support/SimpleFieldSet.java
Log:
Minor refactoring

Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-04-24 
11:33:28 UTC (rev 12913)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java       2007-04-24 
11:39:40 UTC (rev 12914)
@@ -479,17 +479,11 @@
                                while(true) {
                                        // Iterate subsets.
                                        if(subIterator != null && 
subIterator.hasNext()) {
-                                               if(ret != null)
-                                                       // Found next but one, 
can return next
-                                                       return ret;
                                                ret = (String) 
subIterator.next();
-                                               if(subIterator.hasNext()) {
+                                               if(subIterator.hasNext())
                                                        if(ret != null) return 
ret;
-                                               } else {
-                                                       subIterator = null;
-                                               }
-                                       } else
-                                               subIterator = null;
+                                       }
+                                       subIterator = null;
                                        if(subsetIterator != null && 
subsetIterator.hasNext()) {
                                                String key = (String) 
subsetIterator.next();
                                                SimpleFieldSet fs = 
(SimpleFieldSet) subsets.get(key);