Author: mrglavas
Date: Tue Oct 31 11:21:31 2006
New Revision: 469613

URL: http://svn.apache.org/viewvc?view=rev&rev=469613
Log:
We need to be careful with StringTokenizers. One of the default delimiters
is form feed (\f or 0x0C). A reference to this character is legal in XML 1.1 
but it isn't a space character so we must exclude it from the delimiter list.

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

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java?view=diff&rev=469613&r1=469612&r2=469613
==============================================================================
--- 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java
 (original)
+++ 
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSAttributeChecker.java
 Tue Oct 31 11:21:31 2006
@@ -1238,8 +1238,7 @@
                          XSConstants.DERIVATION_UNION;
             }
             else {
-                // use the default \t\r\n\f delimiters
-                StringTokenizer t = new StringTokenizer(value);
+                StringTokenizer t = new StringTokenizer(value, " \n\t\r");
                 while (t.hasMoreTokens()) {
                     String token = t.nextToken ();
 
@@ -1287,8 +1286,7 @@
                          XSConstants.DERIVATION_UNION;
             }
             else {
-                // use the default \t\r\n\f delimiters
-                StringTokenizer t = new StringTokenizer(value);
+                StringTokenizer t = new StringTokenizer(value, " \n\t\r");
                 while (t.hasMoreTokens()) {
                     String token = t.nextToken ();
 
@@ -1320,8 +1318,7 @@
                          XSConstants.DERIVATION_UNION;
             }
             else {
-                // use the default \t\r\n\f delimiters
-                StringTokenizer t = new StringTokenizer(value);
+                StringTokenizer t = new StringTokenizer(value, " \n\t\r");
                 while (t.hasMoreTokens()) {
                     String token = t.nextToken ();
 
@@ -1356,8 +1353,7 @@
                          XSConstants.DERIVATION_UNION;
             }
             else {
-                // use the default \t\r\n\f delimiters
-                StringTokenizer t = new StringTokenizer(value);
+                StringTokenizer t = new StringTokenizer(value, " \n\t\r");
                 while (t.hasMoreTokens()) {
                     String token = t.nextToken ();
 
@@ -1414,8 +1410,7 @@
             // memberTypes = List of QName
             memberType = new Vector();
             try {
-                // use the default \t\r\n\f delimiters
-                StringTokenizer t = new StringTokenizer(value);
+                StringTokenizer t = new StringTokenizer(value, " \n\t\r");
                 while (t.hasMoreTokens()) {
                     String token = t.nextToken ();
                     QName qname = (QName)fExtraDVs[DT_QNAME].validate(token, 
schemaDoc.fValidationContext, null);
@@ -1459,8 +1454,7 @@
                 fNamespaceList.removeAllElements();
 
                 // tokenize
-                // use the default \t\r\n\f delimiters
-                StringTokenizer tokens = new StringTokenizer(value);
+                StringTokenizer tokens = new StringTokenizer(value, " \n\t\r");
                 String token;
                 String tempNamespace;
                 try {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to