Author: mukulg
Date: Tue Aug 10 08:40:07 2010
New Revision: 983882
URL: http://svn.apache.org/viewvc?rev=983882&view=rev
Log:
committing a fix for a problem (XSTypeHelper.schemaTypesIdentical should work
on non-null parameters only) reported by Mikael Asberg on Xerces-J user's list.
Modified:
xerces/java/branches/xml-schema-1.1-dev/samples/xs/XSSerializer.java
Modified: xerces/java/branches/xml-schema-1.1-dev/samples/xs/XSSerializer.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/samples/xs/XSSerializer.java?rev=983882&r1=983881&r2=983882&view=diff
==============================================================================
--- xerces/java/branches/xml-schema-1.1-dev/samples/xs/XSSerializer.java
(original)
+++ xerces/java/branches/xml-schema-1.1-dev/samples/xs/XSSerializer.java Tue
Aug 10 08:40:07 2010
@@ -1061,9 +1061,10 @@ public class XSSerializer {
attrUse.getAttrDeclaration();
XSComplexTypeDefinition enclosingCTDefn = attrDecl.
getEnclosingCTDefinition();
- boolean complexTypesIdentical = XSTypeHelper.schemaTypesIdentical(
- complexTypeDecl,
- enclosingCTDefn);
+ boolean complexTypesIdentical = (enclosingCTDefn == null) ? false :
+
XSTypeHelper.schemaTypesIdentical(
+
complexTypeDecl,
+
enclosingCTDefn);
// do not add attributes, from the base type. they will be
// serialized as part of the base type serialization.
if (complexTypesIdentical) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
