svn commit: r1463218 - /stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java

[rwesten]

Author: rwesten
Date: Mon Apr  1 17:35:48 2013
New Revision: 1463218

URL: http://svn.apache.org/r1463218
Log:
STANBOL-998: fixed a potential NPE in the updateServiceRegistration method

Modified:
    
stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java

Modified: 
stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java?rev=1463218&r1=1463217&r2=1463218&view=diff
==============================================================================
--- 
stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java
 (original)
+++ 
stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteComponent.java
 Mon Apr  1 17:35:48 2013
@@ -574,10 +574,12 @@ public class ReferencedSiteComponent {
             log.info(" - register ReferencedSite '{}'",config.getId());
             try {
                 referencedSite = new ReferencedSiteImpl(config,
-                    offlineMode != null ? null : 
-                        
(EntityDereferencer)dereferencerComponentInstance.getInstance(),
-                    offlineMode != null ? null :
-                        
(EntitySearcher)searcherComponentInstance.getInstance(),
+                    offlineMode == null && dereferencerComponentInstance != 
null ? 
+                        
(EntityDereferencer)dereferencerComponentInstance.getInstance() :
+                            null,
+                    offlineMode == null && searcherComponentInstance != null ? 
+                        
(EntitySearcher)searcherComponentInstance.getInstance() :
+                            null,
                     cache, nsPrefixService);
                 referencedSiteRegistration = 
bc.registerService(Site.class.getName(), referencedSite, 
                     OsgiUtils.copyConfig(cc.getProperties()));