svn commit: r1125210 - /cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Fri May 20 02:50:46 2011
New Revision: 1125210

URL: http://svn.apache.org/viewvc?rev=1125210&view=rev
Log:
Add an NPE guard

Modified:
    
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Modified: 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1125210&r1=1125209&r2=1125210&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Fri May 20 02:50:46 2011
@@ -557,6 +557,7 @@ public class JAXBDataBinding extends Abs
             ctx = JAXBContext.newInstance(classes.toArray(new 
Class[classes.size()]), map);
         } catch (JAXBException ex) {
             if (map.containsKey("com.sun.xml.bind.defaultNamespaceRemap")
+                && ex.getMessage() != null
                 && 
ex.getMessage().contains("com.sun.xml.bind.defaultNamespaceRemap")) {
                 map.put("com.sun.xml.internal.bind.defaultNamespaceRemap",
                         map.remove("com.sun.xml.bind.defaultNamespaceRemap"));