changeset 1449:11ecfc73d66e

Merge jdk7u181-b00
author andrew
date Thu, 19 Apr 2018 17:55:23 +0100
parents 70505535b60c (current diff) 236e9466a0a9 (diff)
children 71fb2bb2ccdf
files .hgtags src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 19 04:49:52 2018 +0100
+++ b/.hgtags	Thu Apr 19 17:55:23 2018 +0100
@@ -685,3 +685,4 @@
 69b8b134531ac80fc5bb5fed746c504fd2f710b4 jdk7u171-b02
 df965e45dd1fcd41126287542b5625dd3dcb100a icedtea-2.6.13
 4996b545086d0850ab89ea33e28989abcfcfdc78 icedtea-2.6.14pre01
+c2f20a5bb465997cb93faac5a09013f3d7b92472 jdk7u181-b00
--- a/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Thu Apr 19 04:49:52 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java	Thu Apr 19 17:55:23 2018 +0100
@@ -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);
         }
     }