Author: cziegeler
Date: Mon Oct 10 14:05:47 2016
New Revision: 1764102
URL: http://svn.apache.org/viewvc?rev=1764102&view=rev
Log:
SLING-6058 introduce sling:config-property-inherit property. Fix getting of
Boolean property if default value is null
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java?rev=1764102&r1=1764101&r2=1764102&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/contextaware/config/resource/impl/def/DefaultConfigurationResourceResolvingStrategy.java
Mon Oct 10 14:05:47 2016
@@ -126,7 +126,7 @@ public class DefaultConfigurationResourc
private Iterator<String> findConfigRefs(final Resource startResource) {
// collect all context path resources
Iterator<Resource> contextResources =
contextPathStrategy.findContextResources(startResource);
-
+
// get config resource path for each context resource, filter out
items where not reference could be resolved
Iterator<String> configPaths = new FilterIterator(new
TransformIterator(contextResources, new Transformer() {
@Override
@@ -134,7 +134,7 @@ public class DefaultConfigurationResourc
return getReference((Resource)input);
}
}), PredicateUtils.notNullPredicate());
-
+
// expand paths and eliminate duplicates
return new PathEliminateDuplicatesIterator(new
PathParentExpandIterator(config.configPath(), configPaths));
}
@@ -246,7 +246,10 @@ public class DefaultConfigurationResourc
if (item != null) {
// check inheritance mode on current level
- listMergingEnabled =
item.getValueMap().get(PROPERTY_CONFIG_COLLECTION_INHERIT, listMergingEnabled);
+ final Boolean inheritVal =
item.getValueMap().get(PROPERTY_CONFIG_COLLECTION_INHERIT, Boolean.class);
+ if ( inheritVal != null ) {
+ listMergingEnabled = inheritVal;
+ }
// in inheritance is enabled on this level and candidates
where collected on previous levels add them now
if (listMergingEnabled == Boolean.TRUE &&
!resultCandidates.isEmpty()) {
