| commit | 2ab39432717db4c128e8f9bae8dac903e811f3c8 | [log] [tgz] |
|---|---|---|
| author | A. J. David Bosschaert <davidb@apache.org> | Fri May 22 11:42:19 2015 +0000 |
| committer | A. J. David Bosschaert <davidb@apache.org> | Fri May 22 11:42:19 2015 +0000 |
| tree | 35a2fa12b5c5921f9057d041e632a92bdc1c7a11 | |
| parent | 95910dda4a0c124d840290a3f5ac6fd163404eb5 [diff] |
FELIX-4883 Fix NPE when creating ServiceReferenceDTO git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1681073 13f79535-47bb-0310-9956-ffa450edef68
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 6ce83b8..eb43a32 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
@@ -192,6 +192,9 @@ private ServiceReferenceDTO serviceReferenceToDTO( ServiceReference<?> serviceRef) { + if (serviceRef == null) + return null; + ServiceReferenceDTO dto = new ServiceReferenceDTO(); dto.bundle = serviceRef.getBundle().getBundleId(); dto.id = (Long) serviceRef.getProperty(Constants.SERVICE_ID);