You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/11/02 15:29:37 UTC

svn commit: r1767707 - /sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java

Author: cziegeler
Date: Wed Nov  2 15:29:37 2016
New Revision: 1767707

URL: http://svn.apache.org/viewvc?rev=1767707&view=rev
Log:
SLING-6233 : Allow configuration of fallback properties for inheritance

Modified:
    sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java

Modified: sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1767707&r1=1767706&r2=1767707&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java (original)
+++ sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java Wed Nov  2 15:29:37 2016
@@ -355,7 +355,7 @@ public class DefaultConfigurationResourc
 
     private boolean getBooleanValue(final ValueMap valueMap, final String key, final String[] additionalKeys) {
         Boolean result = valueMap.get(key, Boolean.class);
-        if ( result != null && !ArrayUtils.isEmpty(additionalKeys) ) {
+        if ( result == null && !ArrayUtils.isEmpty(additionalKeys) ) {
             for(final String name : additionalKeys) {
                 result = valueMap.get(name, Boolean.class);
                 if ( result != null ) {