svn commit: r1551157 - /stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java

[rwesten]

Author: rwesten
Date: Mon Dec 16 10:17:57 2013
New Revision: 1551157

URL: http://svn.apache.org/r1551157
Log:
minor (related to STANBOL-878): ValueTypeSerializerRegistry now checks if the 
Service aquired for the ServiceReference parsed to addService is NULL to avoid 
possible NPE. While this avoid NPE in the logs it not a functional change as 
OSGI correctly recovers from such NPE - hence no need for an own issue

Modified:
    
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java

Modified: 
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java
URL: 
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java?rev=1551157&r1=1551156&r2=1551157&view=diff
==============================================================================
--- 
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java
 (original)
+++ 
stanbol/trunk/enhancer/generic/nlp-json/src/main/java/org/apache/stanbol/enhancer/nlp/json/valuetype/ValueTypeSerializerRegistry.java
 Mon Dec 16 10:17:57 2013
@@ -168,19 +168,21 @@ public class ValueTypeSerializerRegistry
         @Override
         public Object addingService(ServiceReference reference) {
             ValueTypeSerializer<?> service = 
(ValueTypeSerializer<?>)bc.getService(reference);
-            serializerLock.writeLock().lock();
-            try {
-                List<ServiceReference> refs = 
valueTypeSerializerRefs.get(service.getType());
-                if(refs == null){
-                    refs = new ArrayList<ServiceReference>(2);
-                    valueTypeSerializerRefs.put(service.getType(), refs);
+            if(service != null){
+                serializerLock.writeLock().lock();
+                try {
+                    List<ServiceReference> refs = 
valueTypeSerializerRefs.get(service.getType());
+                    if(refs == null){
+                        refs = new ArrayList<ServiceReference>(2);
+                        valueTypeSerializerRefs.put(service.getType(), refs);
+                    }
+                    refs.add(reference);
+                    if(refs.size() > 1){
+                        Collections.sort(refs);
+                    }
+                } finally {
+                    serializerLock.writeLock().unlock();
                 }
-                refs.add(reference);
-                if(refs.size() > 1){
-                    Collections.sort(refs);
-                }
-            } finally {
-                serializerLock.writeLock().unlock();
             }
             return service;
         }