You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by vv...@apache.org on 2015/09/11 15:16:12 UTC

svn commit: r1702457 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java

Author: vvalchev
Date: Fri Sep 11 13:16:11 2015
New Revision: 1702457

URL: http://svn.apache.org/r1702457
Log:
Fixed FELIX-5031 : NPE in Web Console configuration plugin when metatype service is missing
https://issues.apache.org/jira/browse/FELIX-5031

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java?rev=1702457&r1=1702456&r2=1702457&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java Fri Sep 11 13:16:11 2015
@@ -636,6 +636,10 @@ class ConfigAdminSupport
     {
         Dictionary props = config.getProperties();
         Map adMap = (mtss != null) ? mtss.getAttributeDefinitionMap(config, null) : null;
+        if (null == adMap)
+        {
+          return null;
+        }
 
         // check for configured name hint template
         String nameHint = getConfigurationPropertyValueOrDefault(PROPERTY_FACTORYCONFIG_NAMEHINT, props, adMap);