Issue #430: Do not allow loading null config values (use default values instead)

This commit is contained in:
Honfika
2013-12-01 15:09:01 +01:00
parent 09aeafb77b
commit 3aa09fdf2b

View File

@@ -393,8 +393,13 @@ public class Configuration {
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
Object defaultValue = getDefaultValue(field);
Object value = null;
if (config.containsKey(name)) {
field.set(null, new ConfigurationItem(name, defaultValue, config.get(name)));
value = config.get(name);
}
if (value != null) {
field.set(null, new ConfigurationItem(name, defaultValue, value));
} else {
field.set(null, new ConfigurationItem(name, defaultValue));
}