/hg/release/icedtea7-forest-2.1/jaxp: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 7a8825b15df6 in /hg/release/icedtea7-forest-2.1/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp?cmd=changeset;node=7a8825b15df6
author: joehw
date: Fri Apr 06 09:32:57 2012 -0700

	7157609: Issues with loop
	Reviewed-by: hawtin, lancea


changeset a812eed5797d in /hg/release/icedtea7-forest-2.1/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp?cmd=changeset;node=a812eed5797d
author: andrew
date: Thu Jun 07 15:21:39 2012 +0100

	Added tag icedtea-2.1.1 for changeset 7a8825b15df6


diffstat:

 .hgtags                                                                      |   1 +
 sources/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java |  13 ++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diffs (38 lines):

diff -r 1cf75c0e2c96 -r a812eed5797d .hgtags
--- a/.hgtags	Wed Feb 15 08:26:36 2012 +0000
+++ b/.hgtags	Thu Jun 07 15:21:39 2012 +0100
@@ -147,3 +147,4 @@
 0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
 7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
 2ef9b3fbf759c360c147f8631b80b9858f0511f8 icedtea-2.1
+7a8825b15df6a22c6d338d73f228186033c82ed0 icedtea-2.1.1
diff -r 1cf75c0e2c96 -r a812eed5797d sources/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
--- a/sources/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Wed Feb 15 08:26:36 2012 +0000
+++ b/sources/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Thu Jun 07 15:21:39 2012 +0100
@@ -402,6 +402,16 @@
         
         boolean dataFoundForTarget = false;
         boolean sawSpace = fEntityScanner.skipSpaces();
+        // since pseudoattributes are *not* attributes,
+        // their quotes don't need to be preserved in external parameter entities.
+        // the XMLEntityScanner#scanLiteral method will continue to
+        // emit -1 in such cases when it finds a quote; this is
+        // fine for other methods that parse scanned entities,
+        // but not for the scanning of pseudoattributes.  So,
+        // temporarily, we must mark the current entity as not being "literal"
+        Entity.ScannedEntity currEnt = fEntityManager.getCurrentEntity();
+        boolean currLiteral = currEnt.literal;
+        currEnt.literal = false;
         while (fEntityScanner.peekChar() != '?') {
             dataFoundForTarget = true;
             String name = scanPseudoAttribute(scanningTextDecl, fString);
@@ -499,6 +509,9 @@
             }
             sawSpace = fEntityScanner.skipSpaces();
         }
+        // restore original literal value
+        if(currLiteral)
+            currEnt.literal = true;
         // REVISIT: should we remove this error reporting?
         if (scanningTextDecl && state != STATE_DONE) {
             reportFatalError("MorePseudoAttributes", null);