Mercurial > hg > release > icedtea6-1.10

diff --git a/build.properties b/build.properties
--- openjdk/jaxp/build.properties
+++ openjdk/jaxp/build.properties
@@ -77,6 +77,9 @@
 # Where patches to drop bundle sources live
 patches.dir=patches

+# Patches to apply
+jaxp_src.patch.list=7157609.patch
+
 # Sanity information
 sanity.info= Sanity Settings:${line.separator}\
   ant.home=${ant.home}${line.separator}\
diff --git a/patches/jaxp_src/7157609.patch b/patches/jaxp_src/7157609.patch
new file mode 100644
--- /dev/null
+++ openjdk/jaxp/patches/jaxp_src/7157609.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User joehw
+# Date 1333729977 25200
+# Node ID abc9f6855a61c74ca11183ec49fcbbb9e4fa29b1
+# Parent  3f8b55667a6f9d093fcaf4a70c784c426b00685b
+7157609: Issues with loop
+Reviewed-by: hawtin, lancea
+
+diff --git a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+--- src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
++++ src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java
+@@ -402,6 +402,16 @@ public abstract class XMLScanner
+
+         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 @@ public abstract class XMLScanner
+             }
+             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);
author	Andrew John Hughes <ahughes@redhat.com>
date	Fri, 08 Jun 2012 14:23:28 +0100
parents
children