[freenet-cvs] r11935 - trunk/freenet/src/freenet/config

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-02-28 22:41:01 +0000 (Wed, 28 Feb 2007)
New Revision: 11935

Modified:
   trunk/freenet/src/freenet/config/PersistentConfig.java
Log:
Hopefully fix mario's latest commit

Modified: trunk/freenet/src/freenet/config/PersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/PersistentConfig.java	2007-02-28 22:26:21 UTC (rev 11934)
+++ trunk/freenet/src/freenet/config/PersistentConfig.java	2007-02-28 22:41:01 UTC (rev 11935)
@@ -33,17 +33,12 @@
 	
 	public synchronized SimpleFieldSet exportFieldSet(boolean withDefaults) {
 		SimpleFieldSet fs = new SimpleFieldSet(true);
-		SubConfig[] configs;
-		try {
-			synchronized(this) {
-				configs = (SubConfig[]) configsByPrefix.values().toArray(new SubConfig[configsByPrefix.size()]);
-			}
-			for(int i=0;i<configs.length;i++) {
-				SimpleFieldSet scfs = configs[i].exportFieldSet(withDefaults);
-				fs.tput(configs[i].prefix, scfs);
-			}
-		} catch (NoSuchFieldError e) {
-			Logger.error(this, "Caught exception " + e);
+		Iterator configsIterator = configsByPrefix.keySet().iterator();
+		SubConfig currentSubConfig;
+		while (configsIterator.hasNext()) {
+			currentSubConfig = (SubConfig) configsIterator.next();
+			SimpleFieldSet scfs = currentSubConfig.exportFieldSet(withDefaults);
+			fs.tput(currentSubConfig.prefix, scfs);
 		}
 		return fs; 
 	}