Author: mukulg
Date: Tue Nov 30 01:06:18 2010
New Revision: 1040377
URL: http://svn.apache.org/viewvc?rev=1040377&view=rev
Log:
committing changes for JIRA issue XERCESJ-1486 to trunk.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=1040377&r1=1040376&r2=1040377&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java Tue
Nov 30 01:06:18 2010
@@ -1953,6 +1953,7 @@ public class XMLSchemaValidator
&& (next = fCurrentCM.whatCanGoHere(fCurrCMState)).size()
> 0) {
String expected = expectedStr(next);
final int[] occurenceInfo =
fCurrentCM.occurenceInfo(fCurrCMState);
+ String elemExpandedQname = (element.uri != null) ?
"{"+'"'+element.uri+'"'+":"+element.localpart+"}" : element.localpart;
if (occurenceInfo != null) {
final int minOccurs = occurenceInfo[0];
final int maxOccurs = occurenceInfo[1];
@@ -1975,11 +1976,11 @@ public class XMLSchemaValidator
expected, Integer.toString(maxOccurs) });
}
else {
- reportSchemaError("cvc-complex-type.2.4.a", new
Object[] { element.rawname, expected });
+ reportSchemaError("cvc-complex-type.2.4.a", new
Object[] { elemExpandedQname, expected });
}
}
else {
- reportSchemaError("cvc-complex-type.2.4.a", new
Object[] { element.rawname, expected });
+ reportSchemaError("cvc-complex-type.2.4.a", new
Object[] { elemExpandedQname, expected });
}
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
