svn commit: r1148440 - /xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java

2011-07-19 Thread mukulg 
Author: mukulg
Date: Tue Jul 19 16:34:17 2011
New Revision: 1148440

URL: http://svn.apache.org/viewvc?rev=1148440&view=rev
Log:
committing fix for the JIRA issue XERCESJ-1518

Modified:

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

Modified: 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL: 
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=1148440&r1=1148439&r2=1148440&view=diff
==
--- 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
 (original)
+++ 
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
 Tue Jul 19 16:34:17 2011
@@ -77,6 +77,7 @@ import org.apache.xerces.util.StAXLocati
 import org.apache.xerces.util.SymbolHash;
 import org.apache.xerces.util.SymbolTable;
 import org.apache.xerces.util.URI.MalformedURIException;
+import org.apache.xerces.util.XMLChar;
 import org.apache.xerces.util.XMLSymbols;
 import org.apache.xerces.xni.QName;
 import org.apache.xerces.xni.XNIException;
@@ -1380,6 +1381,7 @@ public class XSDHandler {
 String qName = currSchemaDoc.fTargetNamespace == null ?
 ","+lName:
 currSchemaDoc.fTargetNamespace +","+lName;
+qName = XMLChar.trim(qName);
 String componentType = 
DOMUtil.getLocalName(redefineComp);
 if 
(componentType.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP)) {
 checkForDuplicateNames(qName, ATTRIBUTEGROUP_TYPE, 
fUnparsedAttributeGroupRegistry, fUnparsedAttributeGroupRegistrySub, 
redefineComp, currSchemaDoc);
@@ -1436,6 +1438,7 @@ public class XSDHandler {
 String qName = currSchemaDoc.fTargetNamespace == null?
 ","+lName:
 currSchemaDoc.fTargetNamespace +","+lName;
+qName = XMLChar.trim(qName);
 if (componentType.equals(SchemaSymbols.ELT_ATTRIBUTE)) {
 checkForDuplicateNames(qName, ATTRIBUTE_TYPE, 
fUnparsedAttributeRegistry, fUnparsedAttributeRegistrySub, globalComp, 
currSchemaDoc);
 }



-
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org

svn commit: r1148437 - /xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java

2011-07-19 Thread mukulg 
Author: mukulg
Date: Tue Jul 19 16:33:35 2011
New Revision: 1148437

URL: http://svn.apache.org/viewvc?rev=1148437&view=rev
Log:
committing fix for the JIRA issue XERCESJ-1518

Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=1148437&r1=1148436&r2=1148437&view=diff
==
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java 
Tue Jul 19 16:33:35 2011
@@ -69,6 +69,7 @@ import org.apache.xerces.util.StAXInputS
 import org.apache.xerces.util.StAXLocationWrapper;
 import org.apache.xerces.util.SymbolHash;
 import org.apache.xerces.util.SymbolTable;
+import org.apache.xerces.util.XMLChar;
 import org.apache.xerces.util.URI.MalformedURIException;
 import org.apache.xerces.util.XMLSymbols;
 import org.apache.xerces.xni.QName;
@@ -1269,6 +1270,7 @@ public class XSDHandler {
 String qName = currSchemaDoc.fTargetNamespace == null ?
 ","+lName:
 currSchemaDoc.fTargetNamespace +","+lName;
+qName = XMLChar.trim(qName);
 String componentType = 
DOMUtil.getLocalName(redefineComp);
 if 
(componentType.equals(SchemaSymbols.ELT_ATTRIBUTEGROUP)) {
 checkForDuplicateNames(qName, ATTRIBUTEGROUP_TYPE, 
fUnparsedAttributeGroupRegistry, fUnparsedAttributeGroupRegistrySub, 
redefineComp, currSchemaDoc);
@@ -1313,6 +1315,7 @@ public class XSDHandler {
 String qName = currSchemaDoc.fTargetNamespace == null?
 ","+lName:
 currSchemaDoc.fTargetNamespace +","+lName;
+qName = XMLChar.trim(qName);
 String componentType = DOMUtil.getLocalName(globalComp);
 
 if (componentType.equals(SchemaSymbols.ELT_ATTRIBUTE)) {



-
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org