You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by zi...@apache.org on 2004/06/30 19:43:03 UTC
cvs commit: xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal UnmarshalResult.java
zieg 2004/06/30 10:43:03
Modified: v2/src/marshal/org/apache/xmlbeans/impl/marshal
UnmarshalResult.java
Log:
add check for null values returned by user factory
Revision Changes Path
1.32 +5 -0 xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/UnmarshalResult.java
Index: UnmarshalResult.java
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/src/marshal/org/apache/xmlbeans/impl/marshal/UnmarshalResult.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- UnmarshalResult.java 17 Jun 2004 18:05:17 -0000 1.31
+++ UnmarshalResult.java 30 Jun 2004 17:43:03 -0000 1.32
@@ -183,6 +183,11 @@
return um.unmarshal(this);
} else {
final Object initial_obj = of.createObject(rtt.getJavaType());
+ if (initial_obj == null) {
+ String msg = "factory: " + of +
+ " returned null for type " + rtt.getJavaType();
+ throw new IllegalStateException(msg);
+ }
um = rtt.getUnmarshaller();
final Object inter = rtt.createIntermediary(this, initial_obj);
um.unmarshalIntoIntermediary(inter, this);
---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org