--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.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,7 +21,8 @@
 
 package com.sun.org.apache.xerces.internal.impl.validation;
 
-import java.util.Vector;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * ValidationManager is a coordinator property for validators in the
@@ -36,7 +37,7 @@
  */
 public class ValidationManager {
 
-    protected final Vector fVSs = new Vector();
+    protected final List<ValidationState> fVSs = new ArrayList<>();
     protected boolean fGrammarFound = false;
 
     // used by the DTD validator to tell other components that it has a
@@ -49,7 +50,7 @@
      * the validation manager.
      */
     public final void addValidationState(ValidationState vs) {
-        fVSs.addElement(vs);
+        fVSs.add(vs);
     }
 
     /**
@@ -57,7 +58,7 @@
      */
     public final void setEntityState(EntityState state) {
         for (int i = fVSs.size()-1; i >= 0; i--) {
-            ((ValidationState)fVSs.elementAt(i)).setEntityState(state);
+            (fVSs.get(i)).setEntityState(state);
         }
     }
 
@@ -79,7 +80,7 @@
 
 
     public final void reset (){
-        fVSs.removeAllElements();
+        fVSs.clear();
         fGrammarFound = false;
         fCachedDTD = false;
     }