You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2016/10/06 15:29:27 UTC
svn commit: r1763610 -
/felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
Author: cziegeler
Date: Thu Oct 6 15:29:27 2016
New Revision: 1763610
URL: http://svn.apache.org/viewvc?rev=1763610&view=rev
Log:
FELIX-5369 : Metatype Service Inventory Printer json export fails on duplicate keys. Apply patch from Alex Parvulescu
Modified:
felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
Modified: felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java?rev=1763610&r1=1763609&r2=1763610&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java (original)
+++ felix/trunk/webconsole-plugins/metatype/src/main/java/org/apache/felix/webconsole/plugins/metatype/internal/MetatypeInventoryPrinter.java Thu Oct 6 15:29:27 2016
@@ -111,7 +111,7 @@ class MetatypeInventoryPrinter implement
{
for (String pid : pids)
{
- ocd(pw, info.getObjectClassDefinition(pid, null));
+ ocd(pw, info.getObjectClassDefinition(pid, null), pid);
}
}
@@ -120,16 +120,16 @@ class MetatypeInventoryPrinter implement
{
for (String factoryPid : factoryPids)
{
- ocd(pw, info.getObjectClassDefinition(factoryPid, null));
+ ocd(pw, info.getObjectClassDefinition(factoryPid, null), factoryPid);
}
}
pw.endGroup();
}
- private static final void ocd(final Printer pw, final ObjectClassDefinition ocd)
+ private static final void ocd(final Printer pw, final ObjectClassDefinition ocd, String id)
{
- pw.group(ocd.getID());
+ pw.group(id);
pw.keyValue("name", ocd.getName());
pw.keyValue("description", ocd.getDescription());