1 files changed, 4 insertions, 0 deletions
diff --git a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
index 544297da43..83fd31512b 100644
--- a/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
+++ b/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java
@@ -263,6 +263,10 @@ public class RemoteServiceAdminImpl implements RemoteServiceAdmin, ManagedServic
     }
 
     public synchronized void updated(Dictionary props) throws ConfigurationException {
+        if (props == null) {
+            // It can be null in Apache Felix
+            return;
+        }
         String domainRegistry = (String)props.get("org.osgi.sca.domain.registry");
         if (domainRegistry != null) {
             exporter.setDomainRegistry(domainRegistry);