felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vvalc...@apache.org
Subject svn commit: r1309342 - /felix/trunk/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
Date Wed, 04 Apr 2012 11:51:11 GMT
Author: vvalchev
Date: Wed Apr  4 11:51:10 2012
New Revision: 1309342

URL: http://svn.apache.org/viewvc?rev=1309342&view=rev
Log:
If devices share the same friendly name, duplicates are discarded. This commit fixes the problem
and shows all devices.

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

Modified: felix/trunk/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java?rev=1309342&r1=1309341&r2=1309342&view=diff
==============================================================================
--- felix/trunk/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
(original)
+++ felix/trunk/webconsole-plugins/upnp/src/main/java/org/apache/felix/webconsole/plugins/upnp/internal/ConfigurationPrinterImpl.java
Wed Apr  4 11:51:10 2012
@@ -67,7 +67,7 @@ class ConfigurationPrinterImpl implement
             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);
             }
         }
 



Mime
View raw message