cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1304426 - /cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
Date Fri, 23 Mar 2012 15:16:14 GMT
Author: dkulp
Date: Fri Mar 23 15:16:14 2012
New Revision: 1304426

URL: http://svn.apache.org/viewvc?rev=1304426&view=rev
Log:
Merged revisions 1304008 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1304008 | dkulp | 2012-03-22 15:37:26 -0400 (Thu, 22 Mar 2012) | 2 lines

  A NPE guard

........

Modified:
    cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java

Modified: cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java?rev=1304426&r1=1304425&r2=1304426&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
Fri Mar 23 15:16:14 2012
@@ -66,7 +66,8 @@ public class DataReaderImpl<T> extends J
         
         public boolean handleEvent(ValidationEvent event) {
             String msg = event.getMessage();
-            if (msg.contains(":Id") 
+            if (msg != null 
+                && msg.contains(":Id") 
                 && (msg.startsWith("cvc-type.3.1.1: ") 
                     || msg.startsWith("cvc-type.3.2.2: ") 
                     || msg.startsWith("cvc-complex-type.3.1.1: ")



Mime
View raw message