--- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java	Tue Sep 05 13:40:14 2017 +0200
+++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java	Wed Oct 18 13:25:49 2017 -0700
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * @LastModified: Oct 2017
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -53,6 +54,7 @@
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -914,7 +916,7 @@
         throws IllegalArgumentException
     {
         if (properties != null) {
-            final Enumeration names = properties.propertyNames();
+            final Enumeration<?> names = properties.propertyNames();
 
             while (names.hasMoreElements()) {
                 final String name = (String) names.nextElement();
@@ -967,7 +969,7 @@
         if (_properties == null) return;
 
         // Get a list of all the defined properties
-        Enumeration names = _properties.propertyNames();
+        Enumeration<?> names = _properties.propertyNames();
         while (names.hasMoreElements()) {
             // Note the use of get() instead of getProperty()
             String name  = (String) names.nextElement();
@@ -1046,7 +1048,7 @@
         String doctypeSystem = null;
 
         // Get a list of all the defined properties
-        Enumeration names = _properties.propertyNames();
+        Enumeration<?> names = _properties.propertyNames();
         while (names.hasMoreElements()) {
             // Note the use of get() instead of getProperty()
             String name  = (String) names.nextElement();
@@ -1097,7 +1099,7 @@
             else if (name.equals(OutputKeys.CDATA_SECTION_ELEMENTS)) {
                 if (value != null) {
                     StringTokenizer e = new StringTokenizer(value);
-                    ArrayList<String> uriAndLocalNames = null;
+                    List<String> uriAndLocalNames = null;
                     while (e.hasMoreTokens()) {
                         final String token = e.nextToken();
 
@@ -1147,7 +1149,7 @@
         // Copy propeties set in stylesheet to base
         final Properties base = new Properties(defaults);
         if (outputProperties != null) {
-            final Enumeration names = outputProperties.propertyNames();
+            final Enumeration<?> names = outputProperties.propertyNames();
             while (names.hasMoreElements()) {
                 final String name = (String) names.nextElement();
                 base.setProperty(name, outputProperties.getProperty(name));
@@ -1184,12 +1186,12 @@
                 final Properties method_props =
                         OutputPropertiesFactory.getDefaultMethodProperties(method);
                 {
-                        final Enumeration names = method_props.propertyNames();
-                        while (names.hasMoreElements())
-                        {
-                                final String name = (String)names.nextElement();
-                                props.setProperty(name, method_props.getProperty(name));
-                        }
+                    final Enumeration<?> names = method_props.propertyNames();
+                    while (names.hasMoreElements())
+                    {
+                        final String name = (String)names.nextElement();
+                        props.setProperty(name, method_props.getProperty(name));
+                    }
                 }
         }
     /**