[felix-dev] branch master updated: FELIX-6500 : Fixed NPE. (#149)

[cziegeler]

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 00a7eb5c0a FELIX-6500 : Fixed NPE. (#149)
00a7eb5c0a is described below

commit 00a7eb5c0ad63ff059be9709a8e3c4bb29530613
Author: mbaedke <manfred.bae...@gmail.com>
AuthorDate: Fri May 6 09:45:37 2022 +0200

    FELIX-6500 : Fixed NPE. (#149)
    
    Co-authored-by: Manfred Baedke <manfred.bae...@greenbytes.de>
---
 .../felix/webconsole/internal/configuration/ConfigJsonSupport.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigJsonSupport.java
 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigJsonSupport.java
index 760101ac69..323ac13e0b 100644
--- 
a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigJsonSupport.java
+++ 
b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigJsonSupport.java
@@ -350,7 +350,7 @@ class ConfigJsonSupport {
 
                 final Configuration c = ConfigurationUtil.findConfiguration( 
this.configurationAdmin, id );
                 Configuration config = c;
-                if (!this.configurationHandlers.isEmpty()) {
+                if (null != config && !this.configurationHandlers.isEmpty()) {
                     for(final ConfigurationHandler handler : 
this.configurationHandlers) {
                         if (!handler.listConfiguration(config.getFactoryPid(), 
config.getPid())) {
                             config = null;