Mercurial > hg > release > icedtea8-forest-3.0 > jaxp

changeset 1326:26c297e9f11b jdk8u75-b02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 04 Jan 2016 08:42:50 -0800
parents 386a604af3bf (diff) 01b1ca6a8807 (current diff)
children 2a292503c557
files .hgtags
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Jan 03 22:39:19 2016 -0800
+++ b/.hgtags	Mon Jan 04 08:42:50 2016 -0800
@@ -538,3 +538,5 @@
 05c35ec04d298ad11a97a0c82e54e4468542c6e7 jdk8u72-b14
 1bcc418943405c5ef677eb3f63783683261bd2d3 jdk8u72-b15
 2b3d0e6f3cd179e2346679af2a8881bb6b20f968 jdk8u72-b31
+eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
+06cdf5dc679e0fef7c8e37c5c712b2c5891c1444 jdk8u75-b01
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Sun Jan 03 22:39:19 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Mon Jan 04 08:42:50 2016 -0800
@@ -36,6 +36,7 @@
 import com.sun.org.apache.xml.internal.serializer.ToHTMLStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -104,9 +105,9 @@
             }
         }
 
-        // Check if we have any declared namesaces
+        // Check if we have any declared namespaces
         if (_accessedPrefixes == null) {
-            _accessedPrefixes = new HashMap<>();
+            _accessedPrefixes = new Hashtable<>();
         }
         else {
             if (!declared) {
--- a/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Sun Jan 03 22:39:19 2016 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Mon Jan 04 08:42:50 2016 -0800
@@ -975,6 +975,7 @@
                         fStringBuffer2.append('\n');
                     }
                 } else if (c != -1 && XMLChar.isHighSurrogate(c)) {
+                    fStringBuffer3.clear();
                     if (scanSurrogates(fStringBuffer3)) {
                         stringBuffer.append(fStringBuffer3);
                         if (entityDepth == fEntityDepth && fNeedNonNormalizedValue) {