[EMAIL PROTECTED] wrote: > - final String mode = (this.settings != null ? > this.settings.getRunningMode() : SettingsDefaults.DEFAULT_RUNNING_MODE); > + final String mode = this.settings.getRunningMode(); Could you please revert this change? The idea behind the initial code is to have a fully functional bean even if the dependencies (like settings) are not available (for example for unit testing). If settings are set, both lines deliver the same result.
> - if ( mergedProps.size() > 0 ) { > + if (mergedProps.size() > 0) { Could you please try and not reformat the code while changing it? Your recent commits contain a lot of code reformatting and a few code changes. It's very hard to review the commit mails this way. It's better to change the code with one commit and *if required* do only code formatting in another separata commit. Thanks Carsten -- Carsten Ziegeler - Chief Architect http://www.s-und-n.de http://www.osoco.org/weblogs/rael/