[sling-org-apache-sling-caconfig-impl] branch master updated: SLING-7361 CAConfig Impl: Fix potential NPE in ConfigurationBuilder

[ss...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git


The following commit(s) were added to refs/heads/master by this push:
     new 394418f  SLING-7361 CAConfig Impl: Fix potential NPE in ConfigurationBuilder
394418f is described below

commit 394418f7fc579d846c8ef9cb2361b7199ec7dbe2
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Jan 8 10:55:18 2018 +0100

    SLING-7361 CAConfig Impl: Fix potential NPE in ConfigurationBuilder
---
 .../java/org/apache/sling/caconfig/impl/ConfigurationBuilderImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@ class ConfigurationBuilderImpl implements ConfigurationBuilder {
             // 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

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].