Author: kmorin Date: 2014-09-11 17:15:04 +0200 (Thu, 11 Sep 2014) New Revision: 2626 Url: http://forge.nuiton.org/projects/nuiton-config/repository/revisions/2626 Log: fixes #3507 [ApplicationConfig] NPE when saving null value for an option Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java Modified: trunk/src/main/java/org/nuiton/config/ApplicationConfig.java =================================================================== --- trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-08-16 13:21:38 UTC (rev 2625) +++ trunk/src/main/java/org/nuiton/config/ApplicationConfig.java 2014-09-11 15:15:04 UTC (rev 2626) @@ -1300,16 +1300,23 @@ /** * Set option value. + * If the value is null, then the option is removed. * * @param key property key * @param value property value */ public void setOption(String key, String value) { + Properties props; if (inParseOptionPhase) { - line.setProperty(key, value); + props = line; } else { - options.setProperty(key, value); + props = options; } + if (value == null) { + props.remove(key); + } else { + props.setProperty(key, value); + } } /**