[sling-org-apache-sling-caconfig-impl] branch master updated: SLING-8344 Avoid NPE in ConfigurationOverrideMultiplexerImpl when not configuration resource is present

[sseifert]

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 6511aa8  SLING-8344 Avoid NPE in ConfigurationOverrideMultiplexerImpl 
when not configuration resource is present
6511aa8 is described below

commit 6511aa84f4a0e0ace87266b408bb6c2094bf4eb0
Author: sseifert <sseif...@pro-vision.de>
AuthorDate: Thu Apr 4 13:53:02 2019 +0200

    SLING-8344 Avoid NPE in ConfigurationOverrideMultiplexerImpl when not 
configuration resource is present
---
 .../impl/override/ConfigurationOverrideMultiplexerImpl.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java
 
b/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java
index 8184b4c..c788e58 100644
--- 
a/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java
+++ 
b/src/main/java/org/apache/sling/caconfig/impl/override/ConfigurationOverrideMultiplexerImpl.java
@@ -117,7 +117,7 @@ public class ConfigurationOverrideMultiplexerImpl 
implements ConfigurationOverri
         if (configResource == null) {
             return null;
         }
-        return overrideProperties(contextPath, configName, configResource, 
null);
+        return overrideProperties(contextPath, configName, configResource, 
configResource.getResourceResolver());
     }
     
     @Override
@@ -133,8 +133,8 @@ public class ConfigurationOverrideMultiplexerImpl 
implements ConfigurationOverri
         }
         if (log.isTraceEnabled()) {
             log.trace("! Override properties for context path " + contextPath 
+ ", name '" + configName + "', "
-                    + (configResource.getPath() != null ? "config path " + 
configResource.getPath() : "no config path") + ": "
-                    + MapUtil.traceOutput(configResource.getValueMap()) + " -> 
" + MapUtil.traceOutput(overrideProperties));
+                    + (configResource != null ? "config path " + 
configResource.getPath() : "no config path") + ": "
+                    + (configResource != null ? 
MapUtil.traceOutput(configResource.getValueMap()) : "empty") + " -> " + 
MapUtil.traceOutput(overrideProperties));
         }
         return new ConfigurationResourceWrapper(configResourceToUse, new 
ValueMapDecorator(overrideProperties));
     }