changeset 1913:69baf6bf307c

Merge
author asaha
date Wed, 07 Feb 2018 13:42:58 -0800
parents 443fcedc1631 (current diff) bf8b361d21e8 (diff)
children 2edd0399729b
files .hgtags
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jan 30 15:37:59 2018 -0800
+++ b/.hgtags	Wed Feb 07 13:42:58 2018 -0800
@@ -856,8 +856,10 @@
 0eb59cc7716f47525b80b9764c86188063e7cfff jdk8u171-b02
 1e523ce5792f08f3dc015084e3f018d6ee0c5859 jdk8u171-b03
 a19f8b3a9242df77ed3df29ceefc30d0b0d2766c jdk8u171-b04
+5279c6da822efa9073793968777a2b3a65376e8e jdk8u171-b05
 dcef061c36284bbf5a9f7093dcbc134b9f62e9f5 jdk8u172-b00
 a8bd8d03df39500a37fd8066104bfd02daae9d5c jdk8u172-b01
 78e071b5c0675416e499e26d82903f436de83156 jdk8u172-b02
 f6f4bebcbf4b7df5eca6e253b596851cca18b5c4 jdk8u172-b03
 d7f51a2cb3fac2d3a7a3ebcd55adaf7b251a3973 jdk8u172-b04
+264518389b7f9b5969aa6914f83cc70f527ec4c9 jdk8u172-b05
--- a/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Tue Jan 30 15:37:59 2018 -0800
+++ b/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Wed Feb 07 13:42:58 2018 -0800
@@ -1,6 +1,5 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
  */
 /*
  * Copyright 1999-2002,2004,2005 The Apache Software Foundation.
@@ -608,7 +607,8 @@
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         if (nodes != null) {
-            nodes = new ArrayList(nodes);
+            // cast to Vector is required
+            nodes = new ArrayList((Vector)nodes);
         }
     }