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

changeset 1320:2ed6ee446f61

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 15 Dec 2015 14:36:40 -0800
parents 8297b59f265f (diff) 9ac883da35eb (current diff)
children 06cdf5dc679e
files .hgtags
diffstat 3 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 15 14:21:54 2015 -0800
+++ b/.hgtags	Tue Dec 15 14:36:40 2015 -0800
@@ -533,3 +533,4 @@
 8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11
 68b880e0f5de1d49914790f1a6e5c6e4c3847434 jdk8u72-b12
 58630fde67f4ba7b0fbe8509bb0b105f065383a8 jdk8u72-b13
+eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Tue Dec 15 14:21:54 2015 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Tue Dec 15 14:36:40 2015 -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	Tue Dec 15 14:21:54 2015 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Tue Dec 15 14:36:40 2015 -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) {