Author: mukulg
Date: Wed Oct 10 11:42:43 2012
New Revision: 1396551
URL: http://svn.apache.org/viewvc?rev=1396551&view=rev
Log:
committing fix for jira issue, XERCESJ-1591
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java?rev=1396551&r1=1396550&r2=1396551&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDAttributeGroupTraverser.java
Wed Oct 10 11:42:43 2012
@@ -179,7 +179,8 @@ class XSDAttributeGroupTraverser extends
attrGrp.fAnnotations = annotations;
// make an entry in global declarations.
- if (grammar.getGlobalAttributeGroupDecl(attrGrp.fName) == null) {
+ if (grammar.getGlobalAttributeGroupDecl(attrGrp.fName) == null ||
+
DOMUtil.getLocalName(DOMUtil.getParent(elmNode)).equals(SchemaSymbols.ELT_REDEFINE))
{
grammar.addGlobalAttributeGroupDecl(attrGrp);
}
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java?rev=1396551&r1=1396550&r2=1396551&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Wed Oct 10 11:42:43 2012
@@ -221,8 +221,10 @@ class XSDGroupTraverser extends XSDAbst
annotations = XSObjectListImpl.EMPTY_LIST;
}
group.fAnnotations = annotations;
+
// Add group declaration to grammar
- if (grammar.getGlobalGroupDecl(group.fName) == null) {
+ if (grammar.getGlobalGroupDecl(group.fName) == null ||
+
DOMUtil.getLocalName(DOMUtil.getParent(elmNode)).equals(SchemaSymbols.ELT_REDEFINE))
{
grammar.addGlobalGroupDecl(group);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
