jdk-sandbox: comparison jdk/src/share/classes/java/sql/DriverManager.java

equal deleted inserted replaced

-:0419f45c7761
+:44dfee24cb71
 import java.util.Iterator;
 import java.util.ServiceLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.concurrent.CopyOnWriteArrayList;
+import sun.reflect.CallerSensitive;
 import sun.reflect.Reflection;
 /**
 * <P>The basic service for managing a set of JDBC drivers.<br>
 * @throws SQLTimeoutException  when the driver has determined that the
 * timeout value specified by the {@code setLoginTimeout} method
 * has been exceeded and has at least tried to cancel the
 * current database connection attempt
 */
+@CallerSensitive
 public static Connection getConnection(String url,
 java.util.Properties info) throws SQLException {
-// Gets the classloader of the code that called this method, may
+return (getConnection(url, info, Reflection.getCallerClass()));
-// be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
-return (getConnection(url, info, callerCL));
 }
 /**
 * Attempts to establish a connection to the given database URL.
 * The <code>DriverManager</code> attempts to select an appropriate driver from
 * @throws SQLTimeoutException  when the driver has determined that the
 * timeout value specified by the {@code setLoginTimeout} method
 * has been exceeded and has at least tried to cancel the
 * current database connection attempt
 */
+@CallerSensitive
 public static Connection getConnection(String url,
 String user, String password) throws SQLException {
 java.util.Properties info = new java.util.Properties();
-// Gets the classloader of the code that called this method, may
-// be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
 if (user != null) {
 info.put("user", user);
 }
 if (password != null) {
 info.put("password", password);
 }
-return (getConnection(url, info, callerCL));
+return (getConnection(url, info, Reflection.getCallerClass()));
 }
 /**
 * Attempts to establish a connection to the given database URL.
 * The <code>DriverManager</code> attempts to select an appropriate driver from
 * @throws SQLTimeoutException  when the driver has determined that the
 * timeout value specified by the {@code setLoginTimeout} method
 * has been exceeded and has at least tried to cancel the
 * current database connection attempt
 */
+@CallerSensitive
 public static Connection getConnection(String url)
 throws SQLException {
 java.util.Properties info = new java.util.Properties();
+return (getConnection(url, info, Reflection.getCallerClass()));
-// Gets the classloader of the code that called this method, may
-// be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
-return (getConnection(url, info, callerCL));
 }
 /**
 * Attempts to locate a driver that understands the given URL.
 * The <code>DriverManager</code> attempts to select an appropriate driver from
 *     <code>jdbc:<em>subprotocol</em>:<em>subname</em></code>
 * @return a <code>Driver</code> object representing a driver
 * that can connect to the given URL
 * @exception SQLException if a database access error occurs
 */
+@CallerSensitive
 public static Driver getDriver(String url)
 throws SQLException {
 println("DriverManager.getDriver(\"" + url + "\")");
-// Gets the classloader of the code that called this method, may
+Class<?> callerClass = Reflection.getCallerClass();
-// be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
 // Walk through the loaded registeredDrivers attempting to locate someone
 // who understands the given URL.
 for (DriverInfo aDriver : registeredDrivers) {
 // If the caller does not have permission to load the driver then
 // skip it.
-if(isDriverAllowed(aDriver.driver, callerCL)) {
+if(isDriverAllowed(aDriver.driver, callerClass)) {
 try {
 if(aDriver.driver.acceptsURL(url)) {
 // Success!
 println("getDriver returning " + aDriver.driver.getClass().getName());
 return (aDriver.driver);
 *  Applets can only deregister drivers from their own classloaders.
 *
 * @param driver the JDBC Driver to drop
 * @exception SQLException if a database access error occurs
 */
+@CallerSensitive
 public static synchronized void deregisterDriver(Driver driver)
 throws SQLException {
 if (driver == null) {
 return;
 }
-// Gets the classloader of the code that called this method,
-// may be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
 println("DriverManager.deregisterDriver: " + driver);
 DriverInfo aDriver = new DriverInfo(driver);
 if(registeredDrivers.contains(aDriver)) {
-if (isDriverAllowed(driver, callerCL)) {
+if (isDriverAllowed(driver, Reflection.getCallerClass())) {
 registeredDrivers.remove(aDriver);
 } else {
 // If the caller does not have permission to load the driver then
 // throw a SecurityException.
 throw new SecurityException();
 * <P><B>Note:</B> The classname of a driver can be found using
 * <CODE>d.getClass().getName()</CODE>
 *
 * @return the list of JDBC Drivers loaded by the caller's class loader
 */
+@CallerSensitive
 public static java.util.Enumeration<Driver> getDrivers() {
 java.util.Vector<Driver> result = new java.util.Vector<>();
-// Gets the classloader of the code that called this method, may
+Class<?> callerClass = Reflection.getCallerClass();
-// be null.
-ClassLoader callerCL = DriverManager.getCallerClassLoader();
 // Walk through the loaded registeredDrivers.
 for(DriverInfo aDriver : registeredDrivers) {
 // If the caller does not have permission to load the driver then
 // skip it.
-if(isDriverAllowed(aDriver.driver, callerCL)) {
+if(isDriverAllowed(aDriver.driver, callerClass)) {
 result.addElement(aDriver.driver);
 } else {
 println("    skipping: " + aDriver.getClass().getName());
 }
 }
 }
 }
 //------------------------------------------------------------------------
-// Internal method used to get the caller's class loader.
-// Replaces the call to the native method
-private static ClassLoader getCallerClassLoader() {
-Class<?> cc = Reflection.getCallerClass(3);
-ClassLoader cl = (cc != null) ? cc.getClassLoader() : null;
-return cl;
-}
 // Indicates whether the class object that would be created if the code calling
 // DriverManager is accessible.
+private static boolean isDriverAllowed(Driver driver, Class<?> caller) {
+ClassLoader callerCL = caller != null ? caller.getClassLoader() : null;
+return isDriverAllowed(driver, callerCL);
+}
 private static boolean isDriverAllowed(Driver driver, ClassLoader classLoader) {
 boolean result = false;
 if(driver != null) {
 Class<?> aClass = null;
 try {
 }
 //  Worker method called by the public getConnection() methods.
 private static Connection getConnection(
-String url, java.util.Properties info, ClassLoader callerCL) throws SQLException {
+String url, java.util.Properties info, Class<?> caller) throws SQLException {
 /*
 * When callerCl is null, we should check the application's
 * (which is invoking this class indirectly)
 * classloader, so that the JDBC driver class outside rt.jar
 * can be loaded from here.
 */
+ClassLoader callerCL = caller != null ? caller.getClassLoader() : null;
 synchronized(DriverManager.class) {
 // synchronize loading of the correct classloader.
-if(callerCL == null) {
+if (callerCL == null) {
 callerCL = Thread.currentThread().getContextClassLoader();
 }
 }
 if(url == null) {
 throw new SQLException("The url cannot be null", "08001");
 }

changeset 16906	44dfee24cb71
parent 16887	b7c122a88eed
child 17199	28853592ce2b