jdk-sandbox: comparison jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactoryFinder.java

equal deleted inserted replaced

-:857b5e6eef37
+:35843e3d5ef1
 /*
-* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+* 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
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Properties;
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
+import java.util.function.Supplier;
 /**
 * Implementation of {@link XPathFactory#newInstance(String)}.
 *
 * @author <a href="Kohsuke.Kawaguchi@Sun.com">Kohsuke Kawaguchi</a>
 private volatile static boolean firstTime = true;
 /**
 * <p>Conditional debug printing.</p>
 *
-* @param msg to print
+* @param msgGen Supplier function that returns debug message
 */
-private static void debugPrintln(String msg) {
+private static void debugPrintln(Supplier<String> msgGen) {
 if (debug) {
-System.err.println("JAXP: " + msg);
+System.err.println("JAXP: " + msgGen.get());
 }
 }
 /**
 * <p><code>ClassLoader</code> to use to find <code>XPathFactory</code>.</p>
 }
 private void debugDisplayClassLoader() {
 try {
 if( classLoader == ss.getContextClassLoader() ) {
-debugPrintln("using thread context class loader ("+classLoader+") for search");
+debugPrintln(() -> "using thread context class loader ("+classLoader+") for search");
 return;
 }
 } catch( Throwable unused ) {
 // getContextClassLoader() undefined in JDK1.1
 }
 if( classLoader==ClassLoader.getSystemClassLoader() ) {
-debugPrintln("using system class loader ("+classLoader+") for search");
+debugPrintln(() -> "using system class loader ("+classLoader+") for search");
 return;
 }
-debugPrintln("using class loader ("+classLoader+") for search");
+debugPrintln(() -> "using class loader ("+classLoader+") for search");
 }
 /**
 * <p>Creates a new {@link XPathFactory} object for the specified
 * object model.</p>
 if (uri == null) {
 throw new NullPointerException();
 }
 XPathFactory f = _newFactory(uri);
 if (f != null) {
-debugPrintln("factory '" + f.getClass().getName() + "' was found for " + uri);
+debugPrintln(()->"factory '" + f.getClass().getName() + "' was found for " + uri);
 } else {
-debugPrintln("unable to find a factory for " + uri);
+debugPrintln(()->"unable to find a factory for " + uri);
 }
 return f;
 }
 /**
 String propertyName = SERVICE_CLASS.getName() + ":" + uri;
 // system property look up
 try {
-debugPrintln("Looking up system property '"+propertyName+"'" );
+debugPrintln(()->"Looking up system property '"+propertyName+"'" );
 String r = ss.getSystemProperty(propertyName);
 if(r!=null) {
-debugPrintln("The value is '"+r+"'");
+debugPrintln(()->"The value is '"+r+"'");
 xpathFactory = createInstance(r, true);
 if (xpathFactory != null) {
 return xpathFactory;
 }
 } else
-debugPrintln("The property is undefined.");
+debugPrintln(()->"The property is undefined.");
 } catch( Throwable t ) {
 if( debug ) {
-debugPrintln("failed to look up system property '"+propertyName+"'" );
+debugPrintln(()->"failed to look up system property '"+propertyName+"'" );
 t.printStackTrace();
 }
 }
 String javah = ss.getSystemProperty( "java.home" );
 synchronized(cacheProps){
 if(firstTime){
 File f=new File( configFile );
 firstTime = false;
 if(ss.doesFileExist(f)){
-debugPrintln("Read properties file " + f);
+debugPrintln(()->"Read properties file " + f);
 cacheProps.load(ss.getFileInputStream(f));
 }
 }
 }
 }
 final String factoryClassName = cacheProps.getProperty(propertyName);
-debugPrintln("found " + factoryClassName + " in $java.home/jaxp.properties");
+debugPrintln(()->"found " + factoryClassName + " in $java.home/jaxp.properties");
 if (factoryClassName != null) {
 xpathFactory = createInstance(factoryClassName, true);
 if(xpathFactory != null){
 return xpathFactory;
 return xpathFactory;
 }
 // platform default
 if(uri.equals(XPathFactory.DEFAULT_OBJECT_MODEL_URI)) {
-debugPrintln("attempting to use the platform default W3C DOM XPath lib");
+debugPrintln(()->"attempting to use the platform default W3C DOM XPath lib");
 return createInstance("com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl", true);
 }
-debugPrintln("all things were tried, but none was found. bailing out.");
+debugPrintln(()->"all things were tried, but none was found. bailing out.");
 return null;
 }
 /** <p>Create class using appropriate ClassLoader.</p>
 *
 XPathFactory createInstance( String className, boolean useServicesMechanism  )
 throws XPathFactoryConfigurationException
 {
 XPathFactory xPathFactory = null;
-debugPrintln("createInstance(" + className + ")");
+debugPrintln(()->"createInstance(" + className + ")");
 // get Class from className
 Class<?> clazz = createClass(className);
 if (clazz == null) {
-debugPrintln("failed to getClass(" + className + ")");
+debugPrintln(()->"failed to getClass(" + className + ")");
 return null;
 }
-debugPrintln("loaded " + className + " from " + which(clazz));
+debugPrintln(()->"loaded " + className + " from " + which(clazz));
 // instantiate Class as a XPathFactory
 try {
 if (!useServicesMechanism) {
 xPathFactory = newInstanceNoServiceLoader(clazz);
 }
 if (xPathFactory == null) {
 xPathFactory = (XPathFactory) clazz.newInstance();
 }
 } catch (ClassCastException classCastException) {
-debugPrintln("could not instantiate " + clazz.getName());
+debugPrintln(()->"could not instantiate " + clazz.getName());
 if (debug) {
 classCastException.printStackTrace();
 }
 return null;
 } catch (IllegalAccessException illegalAccessException) {
-debugPrintln("could not instantiate " + clazz.getName());
+debugPrintln(()->"could not instantiate " + clazz.getName());
 if (debug) {
 illegalAccessException.printStackTrace();
 }
 return null;
 } catch (InstantiationException instantiationException) {
-debugPrintln("could not instantiate " + clazz.getName());
+debugPrintln(()->"could not instantiate " + clazz.getName());
 if (debug) {
 instantiationException.printStackTrace();
 }
 return null;
 }

changeset 42806	35843e3d5ef1
parent 31497	4a6b2e733c0d
child 44378	06aa1b671d17