|
|
|
@ -113,26 +113,24 @@ public class serverSwitch {
|
|
|
|
|
|
|
|
|
|
// remove all values from config that do not appear in init
|
|
|
|
|
this.configRemoved = new ConcurrentHashMap<String, String>();
|
|
|
|
|
synchronized (this.configProps) {
|
|
|
|
|
Iterator<String> i = this.configProps.keySet().iterator();
|
|
|
|
|
String key;
|
|
|
|
|
while (i.hasNext()) {
|
|
|
|
|
key = i.next();
|
|
|
|
|
if (!(initProps.containsKey(key))) {
|
|
|
|
|
this.configRemoved.put(key, this.configProps.get(key));
|
|
|
|
|
i.remove();
|
|
|
|
|
}
|
|
|
|
|
Iterator<String> i = this.configProps.keySet().iterator();
|
|
|
|
|
String key;
|
|
|
|
|
while (i.hasNext()) {
|
|
|
|
|
key = i.next();
|
|
|
|
|
if (!(initProps.containsKey(key))) {
|
|
|
|
|
this.configRemoved.put(key, this.configProps.get(key));
|
|
|
|
|
i.remove();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// merge new props from init to config
|
|
|
|
|
// this is necessary for migration, when new properties are attached
|
|
|
|
|
initProps.putAll(this.configProps);
|
|
|
|
|
this.configProps = initProps;
|
|
|
|
|
// merge new props from init to config
|
|
|
|
|
// this is necessary for migration, when new properties are attached
|
|
|
|
|
initProps.putAll(this.configProps);
|
|
|
|
|
this.configProps = initProps;
|
|
|
|
|
|
|
|
|
|
// save result; this may initially create a config file after
|
|
|
|
|
// initialization
|
|
|
|
|
saveConfig();
|
|
|
|
|
}
|
|
|
|
|
// save result; this may initially create a config file after
|
|
|
|
|
// initialization
|
|
|
|
|
saveConfig();
|
|
|
|
|
|
|
|
|
|
// init thread control
|
|
|
|
|
this.workerThreads = new TreeMap<String, BusyThread>();
|
|
|
|
|