cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r813901 - in /cxf/branches/2.2.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
Date Fri, 11 Sep 2009 16:09:57 GMT
Author: dkulp
Date: Fri Sep 11 16:09:56 2009
New Revision: 813901

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

........
  r812621 | bimargulies | 2009-09-08 14:43:11 -0400 (Tue, 08 Sep 2009) | 1 line
  
  CXF-2413. Avoid NPE on missing xsi:type.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java

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

Modified: cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=813901&r1=813900&r2=813901&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
Fri Sep 11 16:09:56 2009
@@ -49,7 +49,6 @@
  * have its schema in the WSDL. Can specify whether or not unknown objects
  * should be serialized as a byte stream.
  * 
- * @author <a href="mailto:peter.royal@pobox.com">peter royal</a>
  */
 public class ObjectType extends Type {
     private static final QName XSI_TYPE = new QName(SOAPConstants.XSI_NS, "type");
@@ -101,10 +100,11 @@
             throw new DatabindingException("Missing 'xsi:type' attribute value");
         }
 
-        typeName = typeName.trim();
         Type type = null;
         QName typeQName = null;
+        
         if (typeName != null) {
+            typeName = typeName.trim();
             typeQName = extractQName(reader, typeName);
         } else {
             typeQName = reader.getName();



Mime
View raw message