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

[cziegeler]

Author: cziegeler
Date: Thu Nov  3 10:36:05 2016
New Revision: 1767856

URL: http://svn.apache.org/viewvc?rev=1767856&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=1767856&r1=1767855&r2=1767856&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
 Thu Nov  3 10:36:05 2016
@@ -242,7 +242,7 @@ public class DefaultConfigurationResourc
                 }
 
                 // check property inheritance mode on current level - should 
we check on next-highest level as well?
-                propertyInheritance = 
item.getValueMap().get(PROPERTY_CONFIG_PROPERTY_INHERIT, false);
+                propertyInheritance = getBooleanValue(item.getValueMap(), 
PROPERTY_CONFIG_PROPERTY_INHERIT, 
config.configPropertyInheritancePropertyNames());
                 if (!propertyInheritance) {
                     break;
                 }