src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java

*** 1,7 ****
  /*
!  * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2004, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 174,186 ****
              }
          }
  
          String javah = ss.getSystemProperty( "java.home" );
          String configFile = javah + File.separator +
!         "lib" + File.separator + "jaxp.properties";
  
!         // try to read from $java.home/lib/jaxp.properties
          try {
              if(firstTime){
                  synchronized(cacheProps){
                      if(firstTime){
                          File f=new File( configFile );
--- 174,186 ----
              }
          }
  
          String javah = ss.getSystemProperty( "java.home" );
          String configFile = javah + File.separator +
!         "conf" + File.separator + "jaxp.properties";
  
!         // try to read from $java.home/conf/jaxp.properties
          try {
              if(firstTime){
                  synchronized(cacheProps){
                      if(firstTime){
                          File f=new File( configFile );
*** 191,201 ****
                          }
                      }
                  }
              }
              final String factoryClassName = cacheProps.getProperty(propertyName);
!             debugPrintln(()->"found " + factoryClassName + " in $java.home/jaxp.properties");
  
              if (factoryClassName != null) {
                  xpathFactory = createInstance(factoryClassName, true);
                  if(xpathFactory != null){
                      return xpathFactory;
--- 191,201 ----
                          }
                      }
                  }
              }
              final String factoryClassName = cacheProps.getProperty(propertyName);
!             debugPrintln(()->"found " + factoryClassName + " in $java.home/conf/jaxp.properties");
  
              if (factoryClassName != null) {
                  xpathFactory = createInstance(factoryClassName, true);
                  if(xpathFactory != null){
                      return xpathFactory;