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

[andrew at icedtea.classpath.org]

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

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


changeset 335fb0b059b7 in /hg/release/icedtea7-forest-2.2/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2/jaxp?cmd=changeset;node=335fb0b059b7
author: andrew
date: Thu Jun 07 15:30:36 2012 +0100

	Added tag icedtea-2.2.1 for changeset c456e7c89da8


diffstat:

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

diffs (38 lines):

diff -r 0036fe6fe7dc -r 335fb0b059b7 .hgtags
--- a/.hgtags	Wed May 30 22:19:06 2012 +0100
+++ b/.hgtags	Thu Jun 07 15:30:36 2012 +0100
@@ -174,3 +174,4 @@
 501dd924118687733a875bdbebfba3f98ca38a6c jdk7u4-b30
 a90108a5e1612782c4ab49a3e7de422cce7280d8 jdk7u4-b21
 a98d6a2f14a13957841d9836711d5b35ca3146af icedtea-2.2
+c456e7c89da80da5786dd630145c707fc676f06e icedtea-2.2.1
diff -r 0036fe6fe7dc -r 335fb0b059b7 src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Wed May 30 22:19:06 2012 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Thu Jun 07 15:30:36 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);