Author: sandygao
Date: Mon May 30 19:20:04 2011
New Revision: 1129307
URL: http://svn.apache.org/viewvc?rev=1129307&view=rev
Log:
Fixing Jira bug XERCESJ-1512
(https://issues.apache.org/jira/browse/XERCESJ-1512), by capturing pattern
facet when only the empty string is specified as the pattern value.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java?rev=1129307&r1=1129306&r2=1129307&view=diff
==============================================================================
---
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
(original)
+++
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDAbstractTraverser.java
Mon May 30 19:20:04 2011
@@ -287,6 +287,7 @@ abstract class XSDAbstractTraverser {
Vector enumNSDecls = hasQName ? new Vector() : null;
int currentFacet = 0;
xsFacets.reset();
+ boolean seenPattern = false;
while (content != null) {
// General Attribute Checking
Object[] attrs = null;
@@ -369,6 +370,7 @@ abstract class XSDAbstractTraverser {
continue;
}
+ seenPattern = true;
if (fPattern.length() == 0) {
fPattern.append(patternVal);
} else {
@@ -559,7 +561,7 @@ abstract class XSDAbstractTraverser {
xsFacets.enumNSDecls = enumNSDecls;
xsFacets.enumAnnotations = enumAnnotations;
}
- if (fPattern.length() != 0) {
+ if (seenPattern) {
facetsPresent |= XSSimpleType.FACET_PATTERN;
xsFacets.pattern = fPattern.toString();
xsFacets.patternAnnotations = patternAnnotations;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@xerces.apache.org
For additional commands, e-mail: commits-h...@xerces.apache.org
