commit 8c62aaa2055b11183e7bf5520375ec6eafd7e0ef
author A. J. David Bosschaert <davidb@apache.org> Fri May 22 12:46:25 2015 +0000
committer A. J. David Bosschaert <davidb@apache.org> Fri May 22 12:46:25 2015 +0000
tree 399424c97cfda6ccfa6a292f3e1ef9f3ff62d3d8
parent 2ab39432717db4c128e8f9bae8dac903e811f3c8

FELIX-4883 Fix NPE when creating ServiceReferenceDTO - callsite


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

scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java

diff --git a/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java b/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
index eb43a32..4dd05c4 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/runtime/ServiceComponentRuntimeImpl.java
@@ -157,7 +157,9 @@
                 int j = 0;
                 for (ServiceReference<?> serviceRef : serviceRefs)
                 {
-                    srDTOs[j++] = serviceReferenceToDTO(serviceRef);
+                    ServiceReferenceDTO srefDTO = serviceReferenceToDTO(serviceRef);
+                    if (srefDTO != null)
+                        srDTOs[j++] = srefDTO;
                 }
                 dto.boundServices = srDTOs;
                 dtos.add(dto);
@@ -181,7 +183,9 @@
                 int j = 0;
                 for (ServiceReference<?> serviceRef : serviceRefs)
                 {
-                    srDTOs[j++] = serviceReferenceToDTO(serviceRef);
+                    ServiceReferenceDTO srefDTO = serviceReferenceToDTO(serviceRef);
+                    if (srefDTO != null)
+                        srDTOs[j++] = srefDTO;
                 }
                 dto.targetServices = srDTOs;
                 dtos.add(dto);