[sling-org-apache-sling-feature-analyser] branch master updated: SLING-8109 Replace KeyValueMap with Map

[davidb]

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

davidb pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-analyser.git


The following commit(s) were added to refs/heads/master by this push:
     new 0fb4bbf  SLING-8109 Replace KeyValueMap with Map<String,String>
0fb4bbf is described below

commit 0fb4bbf49e2a0c4769840b48d8fc487ac0327fbb
Author: David Bosschaert <bossc...@adobe.com>
AuthorDate: Wed Nov 14 18:21:35 2018 +0000

    SLING-8109 Replace KeyValueMap with Map<String,String>
    
    Fix a NPE
---
 src/main/java/org/apache/sling/feature/analyser/Analyser.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/sling/feature/analyser/Analyser.java 
b/src/main/java/org/apache/sling/feature/analyser/Analyser.java
index 8c1afd3..1ad2e24 100644
--- a/src/main/java/org/apache/sling/feature/analyser/Analyser.java
+++ b/src/main/java/org/apache/sling/feature/analyser/Analyser.java
@@ -174,8 +174,14 @@ public class Analyser {
     private Map<String,String> getConfiguration(final String id) {
         final Map<String,String> result = new HashMap<>();
 
-        result.putAll(this.configurations.get("*"));
-        result.putAll(this.configurations.get(id));
+        Map<String, String> globalCfg = this.configurations.get("*");
+        if (globalCfg != null)
+            result.putAll(globalCfg);
+
+
+        Map<String, String> specificCfg = this.configurations.get(id);
+        if (specificCfg != null)
+            result.putAll(specificCfg);
 
         return result;
     }