You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2010/10/07 13:21:10 UTC

svn commit: r1005419 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java

Author: marrs
Date: Thu Oct  7 11:21:10 2010
New Revision: 1005419

URL: http://svn.apache.org/viewvc?rev=1005419&view=rev
Log:
Improved printing of arrays in property values when converting a ServiceReference to a String.

Modified:
    felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java

Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java?rev=1005419&r1=1005418&r2=1005419&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/ServiceUtil.java Thu Oct  7 11:21:10 2010
@@ -103,7 +103,23 @@ public class ServiceUtil {
                 }
                 buf.append(keys[i]);
                 buf.append('=');
-                buf.append(ref.getProperty(keys[i]));
+                Object val = ref.getProperty(keys[i]);
+                if (val instanceof String[]) {
+                    String[] valArray = (String[]) val;
+                    StringBuffer valBuf = new StringBuffer();
+                    valBuf.append('{');
+                    for (int j = 0; j < valArray.length; j++) {
+                        if (valBuf.length() > 1) {
+                            valBuf.append(',');
+                        }
+                        valBuf.append(valArray[j].toString());
+                    }
+                    valBuf.append('}');
+                    buf.append(valBuf);
+                }
+                else {
+                    buf.append(val.toString());
+                }
             }
             buf.append("}");
             return buf.toString();