Bug 8261: prevent TestBundleDiag from throwing NPE

[odlparent.git] / bundles4-test / src / main / java / org / opendaylight / odlparent / bundles4test / ServiceReferenceUtil.java

diff --git a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java
index 41f9c2ca1608b2816754014aeaa690692e4161a1..767c7ebb51d88c727214a7154accedd7c4b672ed 100644 (file)
--- a/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java
+++ b/bundles4-test/src/main/java/org/opendaylight/odlparent/bundles4test/ServiceReferenceUtil.java
@@ -13,7 +13,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utilities for OSGi's {@link ServiceReference}.
@@ -22,24 +25,30 @@ import org.osgi.framework.ServiceReference;
  */
 public class ServiceReferenceUtil {
 
+    private static final Logger LOG = LoggerFactory.getLogger(ServiceReferenceUtil.class);
+
     public Map<String, Object> getProperties(ServiceReference<?> serviceRef) {
         String[] propertyKeys = serviceRef.getPropertyKeys();
         Map<String, Object> properties = new HashMap<>(propertyKeys.length);
         for (String propertyKey : propertyKeys) {
             Object propertyValue = serviceRef.getProperty(propertyKey);
-            if (propertyValue.getClass().isArray()) {
-                propertyValue = Arrays.asList((Object[]) propertyValue);
+            if (propertyValue != null) {
+                if (propertyValue.getClass().isArray()) {
+                    propertyValue = Arrays.asList((Object[]) propertyValue);
+                }
             }
+            // maintain the null value in the property map anyway
             properties.put(propertyKey, propertyValue);
         }
         return properties;
     }
 
     public List<String> getUsingBundleSymbolicNames(ServiceReference<?> serviceRef) {
-        if (serviceRef.getUsingBundles() == null) {
+        Bundle[] usingBundles = serviceRef.getUsingBundles();
+        if (usingBundles == null) {
             return Collections.emptyList();
         } else {
-            return Arrays.asList(serviceRef.getUsingBundles()).stream()
+            return Arrays.asList(usingBundles).stream()
                 .map(bundle -> bundle.getSymbolicName()).collect(Collectors.toList());
         }
     }