commit 3d1b29fc4847d052fd1c8c77263aaa4b66c43d86
author Christian Schneider <chris@die-schneider.net> Thu May 16 14:46:59 2019 +0200
committer GitHub <noreply@github.com> Thu May 16 14:46:59 2019 +0200
tree 950b446248032e708fbdb6304bd6a0f657e0bd3d
parent 2b6c148d6bd4f0e1664ba7533edd20732af3b82b
parent b2325ce116ab53eead73bb80873b371088615da5

Merge pull request #28 from amichair/illegalstate

Add explicit IllegalStateException in exportService

rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java

diff --git a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
index 40c3f93..d48283c 100644
--- a/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
+++ b/rsa/src/main/java/org/apache/aries/rsa/core/RemoteServiceAdminCore.java
@@ -225,6 +225,9 @@
             }
             final BundleContext serviceContext = serviceBundle.getBundleContext();
             final Object serviceO = serviceContext.getService(serviceReference);
+            if (serviceO == null) {
+                throw new IllegalStateException("service object is null (service was unregistered?)");
+            }
             final Class<?>[] interfaces = getInterfaces(serviceO, interfaceNames);
             final Map<String, Object> eprops = createEndpointProps(serviceProperties, interfaces);