Author: mukulg
Date: Sat Feb  2 02:53:39 2013
New Revision: 1441691

URL: http://svn.apache.org/viewvc?rev=1441691&view=rev
Log:
committing fix for jira issue, XERCESJ-1603

Modified:
    
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=1441691&r1=1441690&r2=1441691&view=diff
==============================================================================
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
 Sat Feb  2 02:53:39 2013
@@ -1298,7 +1298,7 @@ class  XSDComplexTypeTraverser extends X
                 //             Union (3.10.6.3).
 
                 // If explicit open content is null, no need to make any 
changes
-                if (explicitOpenContent != null) {
+                if (explicitOpenContent != null && fOpenContent.fWildcard != 
null) {
                     XSOpenContentDecl oc = new XSOpenContentDecl();
                     oc.fMode = fOpenContent.fMode; // interleave by default
                     oc.fWildcard = 
fSchemaHandler.fXSConstraints.performUnionWith(fOpenContent.fWildcard, 
explicitOpenContent.fWildcard, fOpenContent.fWildcard.fProcessContents);



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to