cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lgaw...@apache.org
Subject svn commit: r470832 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Date Fri, 03 Nov 2006 14:25:26 GMT
Author: lgawron
Date: Fri Nov  3 06:25:26 2006
New Revision: 470832

URL: http://svn.apache.org/viewvc?view=rev&rev=470832
Log:
reverted cocoon mode check

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java?view=diff&rev=470832&r1=470831&r2=470832
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
Fri Nov  3 06:25:26 2006
@@ -91,7 +91,7 @@
         if (this.logger.isDebugEnabled()) {
             this.logger.debug("Processing bean factory: " + beanFactory);
         }
-        final String mode = this.settings.getRunningMode();
+        final String mode = (this.settings != null ? this.settings.getRunningMode() : SettingsDefaults.DEFAULT_RUNNING_MODE);
         final Properties mergedProps = new Properties();
         ResourceUtils.readProperties("classpath*:META-INF/cocoon/properties", mergedProps,
this.resourceLoader,
                 this.logger);



Mime
View raw message