| commit | 9477b3eab22f7f5eb8b46808f0670e169050b56d | [log] [tgz] |
|---|---|---|
| author | Valentin Valchev <vvalchev@apache.org> | Fri Sep 11 13:16:11 2015 +0000 |
| committer | Valentin Valchev <vvalchev@apache.org> | Fri Sep 11 13:16:11 2015 +0000 |
| tree | 4ab297579ca877ac9e022c2300b14853696bf820 | |
| parent | 6cc663fafda4e14f59e629c24e7b14139f6da817 [diff] |
Fixed FELIX-5031 : NPE in Web Console configuration plugin when metatype service is missing https://issues.apache.org/jira/browse/FELIX-5031 git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1702457 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java index 51cffcd..85e94e9 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/configuration/ConfigAdminSupport.java
@@ -636,6 +636,10 @@ { 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);