handle arrays for pids (openhab#557)

Signed-off-by: Kai Kreuzer <[email protected]>
Flole998 · Feb 10, 2019 · e96aa52 · e96aa52
1 parent c5047f2
commit e96aa52
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/...java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResource.java b/...java/org/eclipse/smarthome/io/rest/core/internal/service/ConfigurableServiceResource.java
@@ -310,10 +310,16 @@ private List<ConfigurableServiceDTO> getConfigurableServices() {
     private String getServiceId(ServiceReference<?> serviceReference) {
         Object pid = serviceReference.getProperty(Constants.SERVICE_PID);
         if (pid != null) {
-            return (String) pid;
-        } else {
-            return (String) serviceReference.getProperty(ComponentConstants.COMPONENT_NAME);
+            if (pid instanceof String) {
+                return (String) pid;
+            } else {
+                String[] pidArray = (String[]) pid;
+                if (pidArray.length > 0) {
+                    return pidArray[0];
+                }
+            }
         }
+        return (String) serviceReference.getProperty(ComponentConstants.COMPONENT_NAME);
     }
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC)