svn commit: r1125209 - /cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java

[dkulp]

Author: dkulp
Date: Fri May 20 02:50:08 2011
New Revision: 1125209

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

Modified:
    
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java

Modified: 
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java?rev=1125209&r1=1125208&r2=1125209&view=diff
==============================================================================
--- 
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java 
(original)
+++ 
cxf/trunk/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java 
Fri May 20 02:50:08 2011
@@ -258,6 +258,7 @@ public final class JAXBContextCache {
             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"));