Mercurial > hg > openjdk > jdk8u > jaxp

changeset 1296:ec9701b3846b jdk8u76-b05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 25 Jan 2016 14:49:04 -0800
parents b96204430344 (current diff) c83fd81c6d57 (diff)
children 560debec149d
files .hgtags
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 25 13:22:15 2016 -0800
+++ b/.hgtags	Mon Jan 25 14:49:04 2016 -0800
@@ -429,6 +429,7 @@
 4519799749671cef69091e354b7cd52496f6d970 jdk8u51-b31
 975b01e6be932672edd527f6efe4b430d7bcf07a jdk8u51-b32
 59aea46232797f247aab869d751e4b8090eb4789 jdk8u51-b33
+55657ee85e8e4157836bb4b748d76234b1360e95 jdk8u51-b34
 3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u60-b00
 b0e15cd169a93080c4e30e9eb3061d0b329bf38c jdk8u60-b01
 0b64e727bdb06c82caa02ef25ac2552ce3314537 jdk8u60-b02
@@ -499,6 +500,11 @@
 fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17
 4ae0c2d6dd24931f3f271e645221e5331e351c00 jdk8u66-b18
 8af7da6c13af3c95bc9933e6d1e0d83648f6c0ae jdk8u66-b31
+1db6026e38d41f217bcbe2b619711b850c1788f4 jdk8u66-b32
+a85030db026108135a95b86c343280ed7bda322a jdk8u66-b33
+59dc259db9ad7d7eaa98b9540734bd5c22d9bc86 jdk8u66-b34
+a9f8281d8391e90f255bb754d1d6b31dba18e77d jdk8u66-b35
+d11c3bc0881a83bacfd8fd25f7c8d29cb405afe5 jdk8u66-b36
 700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00
 f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01
 90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02
@@ -531,6 +537,13 @@
 58630fde67f4ba7b0fbe8509bb0b105f065383a8 jdk8u72-b13
 05c35ec04d298ad11a97a0c82e54e4468542c6e7 jdk8u72-b14
 1bcc418943405c5ef677eb3f63783683261bd2d3 jdk8u72-b15
+2b3d0e6f3cd179e2346679af2a8881bb6b20f968 jdk8u72-b31
+eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
+06cdf5dc679e0fef7c8e37c5c712b2c5891c1444 jdk8u75-b01
+26c297e9f11b78b55cdefd22849ae4fe55042a5b jdk8u75-b02
+2a292503c55704cb7f898fa195d76682c0ea6a72 jdk8u75-b03
+cb072b12f5dbe3a249d596078d98a34ec9364187 jdk8u75-b04
+40ccc40d58450eb4518348f6b34885c5a711675a jdk8u75-b05
 acbcb6682c9b3e66f9cc61a6a62e8cb5f24c75d3 jdk8u76-b00
 b3c914ad842d61818e0c5850409f77478b13acc6 jdk8u76-b01
 7711933ec18462ece8a1b9a9527ec873c520b1ab jdk8u76-b02
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java	Mon Jan 25 14:49:04 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	Mon Jan 25 13:22:15 2016 -0800
+++ b/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java	Mon Jan 25 14:49:04 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) {