cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r832136 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Date Mon, 02 Nov 2009 22:09:56 GMT
Author: dkulp
Date: Mon Nov  2 22:09:56 2009
New Revision: 832136

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

........
  r832128 | dkulp | 2009-11-02 17:03:03 -0500 (Mon, 02 Nov 2009) | 1 line
  
  Fix broken test
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java

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

Modified: cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?rev=832136&r1=832135&r2=832136&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Mon Nov  2 22:09:56 2009
@@ -630,7 +630,8 @@
     }
 
     private static Object updateSourceWithXSIType(Object source, final QName typeQName) {
-        if (source instanceof XMLStreamReader) {
+        if (source instanceof XMLStreamReader 
+            && typeQName != null) {
             XMLStreamReader reader = (XMLStreamReader)source;
             String type = reader.getAttributeValue(SOAPConstants.XSI_NS, "type");
             if (StringUtils.isEmpty(type)) {



Mime
View raw message