commit 270e731774b6e24cfb5a7beeb3ec5ae27cb5cdc7
author Valentin Valchev <vvalchev@apache.org> Wed Apr 04 11:51:10 2012 +0000
committer Valentin Valchev <vvalchev@apache.org> Wed Apr 04 11:51:10 2012 +0000
tree 61911b86adfbc0ec99a9d85857f673b55323f89a
parent 1541d4d6a919ee556deec7c4bfd47001224e2bf6

If devices share the same friendly name, duplicates are discarded. This commit fixes the problem and shows all devices.

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

webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java

diff --git a/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java b/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
index f2a5a9f..05b65c5 100644
--- a/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
+++ b/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
@@ -67,7 +67,7 @@
             if (null != ref.getProperty(UPnPDevice.UDN)) // make sure device is valid

             {

                 // order components by friendly name

-                componentMap.put(nameOf(ref), ref);

+                componentMap.put(nameOf(ref).toString() + ref.getProperty(SERVICE_ID), ref);

             }

         }