svn commit: r1599974 - in /stanbol/trunk: ./ commons/ commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/ entityhub/ entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/

[rwesten]

Author: rwesten
Date: Wed Jun  4 08:22:53 2014
New Revision: 1599974

URL: http://svn.apache.org/r1599974
Log:
minor: fixed two NPE in deactivate methods

Modified:
    stanbol/trunk/   (props changed)
    stanbol/trunk/commons/   (props changed)
    
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/StanbolNamespacePrefixService.java
    stanbol/trunk/entityhub/   (props changed)
    
stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java

Propchange: stanbol/trunk/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12:r1599973

Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/commons:r1599973

Modified: 
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/StanbolNamespacePrefixService.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/StanbolNamespacePrefixService.java?rev=1599974&r1=1599973&r2=1599974&view=diff
==============================================================================
--- 
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/StanbolNamespacePrefixService.java
 (original)
+++ 
stanbol/trunk/commons/namespaceprefix/service/src/main/java/org/apache/stanbol/commons/namespaceprefix/service/StanbolNamespacePrefixService.java
 Wed Jun  4 08:22:53 2014
@@ -309,12 +309,12 @@ public class StanbolNamespacePrefixServi
     
     @Deactivate
     protected void deactivate(ComponentContext ctx) {
-        bundleContext = null;
         if(providersTracker != null) {
             providersTracker.close();
             providersTracker = null;
         }
         mappingsFile = null;
+        bundleContext = null;
     }
 
     @Override

Propchange: stanbol/trunk/entityhub/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/entityhub:r1599973

Modified: 
stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java?rev=1599974&r1=1599973&r2=1599974&view=diff
==============================================================================
--- 
stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java
 (original)
+++ 
stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/SesameYardComponent.java
 Wed Jun  4 08:22:53 2014
@@ -224,7 +224,9 @@ public class SesameYardComponent impleme
                log.info(" - currently used Repository was removed (ref: {})", 
serviceReference);
             unregisterSesameYard();
         }
-        List<ServiceReference> others = 
Arrays.asList(repositoryTracker.getServiceReferences());
+        ServiceReference[] serviceRefs = 
repositoryTracker.getServiceReferences();
+        List<ServiceReference> others = serviceRefs == null ? 
Collections.<ServiceReference>emptyList() :
+            Arrays.asList(serviceRefs);
         if(others.size() > 1){
                Collections.sort(others); //sort by priority
         }