src/java.xml.ws/share/classes/javax/xml/ws/spi/FactoryFinder.java

*** 25,36 ****
  
  package javax.xml.ws.spi;
  
  import java.io.*;
  
- import java.nio.file.Files;
- import java.nio.file.Path;
  import java.nio.file.Paths;
  import java.util.Properties;
  import java.util.logging.Level;
  import java.util.logging.Logger;
  import javax.xml.ws.WebServiceException;
--- 25,34 ----
*** 113,143 ****
      }
  
      private static Object fromJDKProperties(String factoryId,
                                              String fallbackClassName,
                                              ClassLoader classLoader) {
!         Path path = null;
          try {
              String JAVA_HOME = System.getProperty("java.home");
!             path = Paths.get(JAVA_HOME, "conf", "jaxws.properties");
  
              // to ensure backwards compatibility
!             if (!Files.exists(path)) {
!                 path = Paths.get(JAVA_HOME, "lib", "jaxws.properties");
              }
  
!             if (!Files.exists(path)) {
                  Properties props = new Properties();
!                 try (InputStream inStream = Files.newInputStream(path)) {
                      props.load(inStream);
                  }
                  String factoryClassName = props.getProperty(factoryId);
                  return ServiceLoaderUtil.newInstance(factoryClassName,
                          fallbackClassName, classLoader, EXCEPTION_HANDLER);
              }
          } catch (Exception ignored) {
!             logger.log(Level.SEVERE, "Error reading JAX-WS configuration from ["  + path +
                      "] file. Check it is accessible and has correct format.", ignored);
          }
          return null;
      }
  
--- 111,143 ----
      }
  
      private static Object fromJDKProperties(String factoryId,
                                              String fallbackClassName,
                                              ClassLoader classLoader) {
!         File f = null;
          try {
              String JAVA_HOME = System.getProperty("java.home");
!             f = Paths.get(JAVA_HOME, "conf", "jaxws.properties").toFile();
  
              // to ensure backwards compatibility
!             if (!f.exists()) {
!                 f = Paths.get(JAVA_HOME, "lib", "jaxws.properties").toFile();
              }
  
!             if (f.exists()) {
                  Properties props = new Properties();
!                 try (InputStream inStream = new FileInputStream(f)) {
                      props.load(inStream);
                  }
                  String factoryClassName = props.getProperty(factoryId);
                  return ServiceLoaderUtil.newInstance(factoryClassName,
                          fallbackClassName, classLoader, EXCEPTION_HANDLER);
              }
          } catch (Exception ignored) {
!             String absolutePath = f != null ? f.getAbsolutePath() : "null";
!             logger.log(Level.SEVERE, "Error reading JAX-WS configuration from ["  +
!                     absolutePath +
                      "] file. Check it is accessible and has correct format.", ignored);
          }
          return null;
      }