You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/24 11:37:44 UTC
svn commit: r424981 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java
Author: cziegeler
Date: Mon Jul 24 02:37:40 2006
New Revision: 424981
URL: http://svn.apache.org/viewvc?rev=424981&view=rev
Log:
Fix property handling
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java?rev=424981&r1=424980&r2=424981&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java Mon Jul 24 02:37:40 2006
@@ -104,7 +104,7 @@
final PropertyProvider provider = (PropertyProvider)rootContext.getBean(PropertyProvider.ROLE);
final Properties providedProperties = provider.getProperties(s, mode, null);
if ( providedProperties != null ) {
- properties.putAll(properties);
+ properties.putAll(providedProperties);
}
} catch (Exception ignore) {
logger.info("Unable to get properties from configured property provider - continuing with initialization.");
@@ -115,7 +115,7 @@
if ( externalPropertyProvider != null ) {
final Properties providedProperties = externalPropertyProvider.getProperties(s, mode, null);
if ( providedProperties != null ) {
- properties.putAll(properties);
+ properties.putAll(providedProperties);
}
}