do not add new solr fields as activated fields

pull/1/head
Michael Peter Christen 13 years ago
parent e3bb73c3d6
commit 3cd6dcd352

@ -121,13 +121,13 @@ public class ConfigurationSet extends AbstractSet<String> implements Set<String>
return false;
}
public void fill(final ConfigurationSet other) {
public void fill(final ConfigurationSet other, final boolean defaultActivated) {
final Iterator<Entry> i = other.allIterator();
Entry e;
while (i.hasNext()) {
e = i.next();
if (contains(e.key) || containsDisabled(e.key)) continue;
this.add(e.key(), other.commentHeadline(e.key()), e.enabled());
this.add(e.key(), other.commentHeadline(e.key()), defaultActivated && e.enabled());
}
}

@ -295,7 +295,7 @@ public final class Switchboard extends serverSwitch
}
// init TrayIcon if possible
tray = new Tray(this);
this.tray = new Tray(this);
// remote proxy configuration
initRemoteProxy();
@ -650,7 +650,7 @@ public final class Switchboard extends serverSwitch
// update the working scheme with the backup scheme. This is necessary to include new features.
// new features are always activated by default
workingScheme.fill(backupScheme);
workingScheme.fill(backupScheme, false);
// set up the solr interface
final String solrurls =
@ -1598,7 +1598,7 @@ public final class Switchboard extends serverSwitch
Domains.close();
AccessTracker.dumpLog(new File("DATA/LOG/queries.log"));
UPnP.deletePortMapping();
tray.remove();
this.tray.remove();
try {
HTTPClient.closeConnectionManager();
} catch ( final InterruptedException e ) {

Loading…
Cancel
Save