From 72551516cb9ed70f2137368e29472999aefdb21f Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 29 Oct 2009 00:06:45 +0000
Subject: Add null check

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830803 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/osgi/remoteserviceadmin/impl/RemoteServiceAdminImpl.java      | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'java/sca/modules/node-impl-osgi/src/main')

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);
-- 
cgit v1.2.3