commit 394418f7fc579d846c8ef9cb2361b7199ec7dbe2
author sseifert <sseifert@pro-vision.de> Mon Jan 08 10:55:18 2018 +0100
committer sseifert <sseifert@pro-vision.de> Mon Jan 08 10:55:18 2018 +0100
tree c8983cd93535836fb760b9793b1f978d531cb776
parent 3b219357449b26c715e70e5fefb4dc38731a0301

SLING-7361 CAConfig Impl: Fix potential NPE in ConfigurationBuilder

src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java

diff --git a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
index 86eb30b..8acb8ee 100644
--- a/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
+++ b/src/main/java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java
@@ -188,7 +188,7 @@
             // apply resource inheritance
             configResource = configurationInheritanceStrategy.getResource(transformedResources);
             // apply overrides
-            configResource = configurationOverrideMultiplexer.overrideProperties(contentResource.getPath(), name, configResource, configResource.getResourceResolver());
+            configResource = configurationOverrideMultiplexer.overrideProperties(contentResource.getPath(), name, configResource, contentResource.getResourceResolver());
             // build name
             if (isCollection) {
                 // get untransformed resource for getting collection item name