--- a/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java	Wed Oct 18 13:25:49 2017 -0700
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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 +22,11 @@
 
 package com.sun.org.apache.xerces.internal.impl.xs.models;
 
-import com.sun.org.apache.xerces.internal.xni.QName;
 import com.sun.org.apache.xerces.internal.impl.xs.SubstitutionGroupHandler;
 import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaException;
+import com.sun.org.apache.xerces.internal.xni.QName;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * XSEmptyCM is a derivative of the abstract content model base class that
@@ -46,7 +48,7 @@
     // start the content model: did not see any children
     private static final short STATE_START = 0;
 
-    private static final ArrayList EMPTY = new ArrayList(0);
+    private static final List<Object> EMPTY = new ArrayList<>(0);
 
     //
     // Data
@@ -128,11 +130,11 @@
      * @return       a list whose entries are instances of
      *               either XSWildcardDecl or XSElementDecl.
      */
-    public ArrayList whatCanGoHere(int[] state) {
+    public List<Object> whatCanGoHere(int[] state) {
         return EMPTY;
     }
 
-    public ArrayList checkMinMaxBounds() {
+    public List<String> checkMinMaxBounds() {
         return null;
     }