svn commit: r1232093 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java

[dkulp]

Author: dkulp
Date: Mon Jan 16 18:20:05 2012
New Revision: 1232093

URL: http://svn.apache.org/viewvc?rev=1232093&view=rev
Log:
Merged revisions 1232048 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1232048 | cschneider | 2012-01-16 11:19:33 -0500 (Mon, 16 Jan 2012) | 1 line
  
  CXF-3983 Fix for NPE
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java?rev=1232093&r1=1232092&r2=1232093&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/core/src/main/java/org/apache/cxf/bus/osgi/WorkQueueSingleConfig.java
 Mon Jan 16 18:20:05 2012
@@ -41,6 +41,9 @@ public class WorkQueueSingleConfig imple
     }
 
     public void updated(@SuppressWarnings("rawtypes") Dictionary properties) 
throws ConfigurationException {
+        if (properties == null) {
+            return;
+        }
         Dictionary<String, String> p = CastUtils.cast(properties);
         String names = (String)properties.get(PROPERTY_PREFIX + ".names");
         String[] nameAr = names.split(",");