Author: bimargulies
Date: Tue Sep 8 18:43:11 2009
New Revision: 812621
URL: http://svn.apache.org/viewvc?rev=812621&view=rev
Log:
CXF-2413. Avoid NPE on missing xsi:type.
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
Modified:
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=812621&r1=812620&r2=812621&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
(original)
+++
cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java
Tue Sep 8 18:43:11 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:[email protected]">peter royal</a>
*/
public class ObjectType extends AegisType {
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();
AegisType type = null;
QName typeQName = null;
+
if (typeName != null) {
+ typeName = typeName.trim();
typeQName = extractQName(reader, typeName);
} else {
typeQName = reader.getName();