commit 82a758f72b43534f33cdd23746b1ec89736704fd
author Valentin Valchev <vvalchev@apache.org> Fri Jun 04 08:52:54 2010 +0000
committer Valentin Valchev <vvalchev@apache.org> Fri Jun 04 08:52:54 2010 +0000
tree aca61622e7ec0445a48cf1a914aad768a604bda2
parent f2bd997e4ecabc1372f851f35758575e5be862ca

Fixed FELIX-2390 /WebConsole Config Manager problem/
https://issues.apache.org/jira/browse/FELIX-2390

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@951329 13f79535-47bb-0310-9956-ffa450edef68

webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java

diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
index 5129242..d95893b 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/compendium/ConfigManager.java
@@ -396,18 +396,23 @@
                 }
 
                 // insert and entry for the PID
-                ObjectClassDefinition ocd = this.getObjectClassDefinition(cfgs[i], locale);
-                String name;
-                if (ocd != null)
+                ObjectClassDefinition ocd = null;
+                try
                 {
-                    name = ocd.getName();
+                    ocd = this.getObjectClassDefinition(cfgs[i], locale);
                 }
-                else
+                catch (IllegalArgumentException t)
                 {
-                    name = pid;
+                    // MetaTypeProvider.getObjectClassDefinition might throw illegal 
+                    // argument exception. So we must catch it here, otherwise the
+                    // other configurations will not be shown
+                    // See https://issues.apache.org/jira/browse/FELIX-2390
                 }
 
-                optionsPlain.put(pid, name);
+                if (ocd != null)
+                {
+                    optionsPlain.put(pid, ocd.getName());
+                }
             }
 
             for (Iterator i = optionsPlain.keySet().iterator(); i.hasNext();)