You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Carsten Ziegeler <cz...@apache.org> on 2006/11/03 15:18:13 UTC

Re: svn commit: r470819 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java

lgawron@apache.org 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/

Re: svn commit: r470819 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java

Posted by Carsten Ziegeler <cz...@apache.org>.
Leszek Gawron wrote:

> OK, sorry for that. Old ctrl + shift + f habbit. 
:)

> Should I revert the changes?
> 
No, no - no need for that.

Carsten
-- 
Carsten Ziegeler - Chief Architect
http://www.s-und-n.de
http://www.osoco.org/weblogs/rael/

Re: svn commit: r470819 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java

Posted by Leszek Gawron <lg...@mobilebox.pl>.
Carsten Ziegeler wrote:
> lgawron@apache.org 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.
OK, the actual problem was settings were not set.

> 
> 
>> -        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.
OK, sorry for that. Old ctrl + shift + f habbit. Should I revert the 
changes?

-- 
Leszek Gawron                                    CTO at MobileBox Ltd.