--- a/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Wed Oct 04 10:44:21 2017 -0700
+++ b/src/java.xml/share/classes/javax/xml/validation/SchemaFactory.java	Wed Oct 04 10:54:18 2017 -0700
@@ -30,6 +30,7 @@
 import java.net.URL;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
+import jdk.xml.internal.SecuritySupport;
 import org.w3c.dom.ls.LSResourceResolver;
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
@@ -111,8 +112,6 @@
  */
 public abstract class SchemaFactory {
 
-     private static SecuritySupport ss = new SecuritySupport();
-
     /**
      * Constructor for derived classes.
      *
@@ -235,7 +234,7 @@
      */
     public static SchemaFactory newInstance(String schemaLanguage) {
         ClassLoader cl;
-        cl = ss.getContextClassLoader();
+        cl = SecuritySupport.getContextClassLoader();
 
         if (cl == null) {
             //cl = ClassLoader.getSystemClassLoader();
@@ -299,7 +298,7 @@
         ClassLoader cl = classLoader;
 
         if (cl == null) {
-            cl = ss.getContextClassLoader();
+            cl = SecuritySupport.getContextClassLoader();
         }
 
         SchemaFactory f = new SchemaFactoryFinder(cl).createInstance(factoryClassName);