--- a/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.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,10 +21,9 @@
 
 package com.sun.org.apache.xpath.internal.compiler;
 
-import java.util.Vector;
-
 import com.sun.org.apache.xml.internal.utils.PrefixResolver;
 import com.sun.org.apache.xpath.internal.res.XPATHErrorResources;
+import java.util.List;
 
 /**
  * This class is in charge of lexical processing of the XPath
@@ -103,11 +102,11 @@
    * Walk through the expression and build a token queue, and a map of the top-level
    * elements.
    * @param pat XSLT Expression.
-   * @param targetStrings Vector to hold Strings, may be null.
+   * @param targetStrings a list to hold Strings, may be null.
    *
    * @throws javax.xml.transform.TransformerException
    */
-  void tokenize(String pat, Vector targetStrings)
+  void tokenize(String pat, List<String> targetStrings)
           throws javax.xml.transform.TransformerException
   {
 
@@ -489,9 +488,9 @@
   /**
    * Record the current token in the passed vector.
    *
-   * @param targetStrings Vector of string.
+   * @param targetStrings a list of strings.
    */
-  private void recordTokenString(Vector targetStrings)
+  private void recordTokenString(List<String> targetStrings)
   {
 
     int tokPos = getTokenQueuePosFromMap(m_patternMapSize - 1);
@@ -505,25 +504,25 @@
       switch (tok)
       {
       case OpCodes.NODETYPE_COMMENT :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_COMMENT);
+        targetStrings.add(PsuedoNames.PSEUDONAME_COMMENT);
         break;
       case OpCodes.NODETYPE_TEXT :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_TEXT);
+        targetStrings.add(PsuedoNames.PSEUDONAME_TEXT);
         break;
       case OpCodes.NODETYPE_NODE :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_ANY);
+        targetStrings.add(PsuedoNames.PSEUDONAME_ANY);
         break;
       case OpCodes.NODETYPE_ROOT :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_ROOT);
+        targetStrings.add(PsuedoNames.PSEUDONAME_ROOT);
         break;
       case OpCodes.NODETYPE_ANYELEMENT :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_ANY);
+        targetStrings.add(PsuedoNames.PSEUDONAME_ANY);
         break;
       case OpCodes.NODETYPE_PI :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_ANY);
+        targetStrings.add(PsuedoNames.PSEUDONAME_ANY);
         break;
       default :
-        targetStrings.addElement(PsuedoNames.PSEUDONAME_ANY);
+        targetStrings.add(PsuedoNames.PSEUDONAME_ANY);
       }
     }
     else
@@ -540,7 +539,7 @@
         tokPos += 2;
       }
 
-      targetStrings.addElement(m_compiler.getTokenQueue().elementAt(tokPos));
+      targetStrings.add((String)m_compiler.getTokenQueue().elementAt(tokPos));
     }
   }