--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java	Wed Oct 18 13:25:49 2017 -0700
@@ -1,6 +1,6 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,8 @@
 
 package com.sun.org.apache.xerces.internal.dom;
 
-import java.util.Vector;
-
+import java.util.ArrayList;
+import java.util.List;
 import org.w3c.dom.CharacterData;
 import org.w3c.dom.DOMException;
 import org.w3c.dom.DocumentFragment;
@@ -127,32 +127,32 @@
                 DOMException.INVALID_STATE_ERR,
                 DOMMessageFormatter.formatMessage(DOMMessageFormatter.DOM_DOMAIN, "INVALID_STATE_ERR", null));
         }
-        Vector startV = new Vector();
+        List<Node> startV = new ArrayList<>();
         Node node;
         for (node=fStartContainer; node != null;
              node=node.getParentNode())
         {
-            startV.addElement(node);
+            startV.add(node);
         }
-        Vector endV = new Vector();
+        List<Node> endV = new ArrayList<>();
         for (node=fEndContainer; node != null;
              node=node.getParentNode())
         {
-            endV.addElement(node);
+            endV.add(node);
         }
         int s = startV.size()-1;
         int e = endV.size()-1;
-        Object result = null;
+        Node result = null;
         while (s>=0 && e>=0) {
-            if (startV.elementAt(s) == endV.elementAt(e)) {
-                result = startV.elementAt(s);
+            if (startV.get(s) == endV.get(e)) {
+                result = startV.get(s);
             } else {
                 break;
             }
             --s;
             --e;
         }
-        return (Node)result;
+        return result;
     }