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

equal deleted inserted replaced

-:604a43386301
+:e8507464a69d
 /*
-* Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1996, 2011, 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
 */
 package java.sql;
 import java.util.Iterator;
-import java.sql.Driver;
 import java.util.ServiceLoader;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.concurrent.CopyOnWriteArrayList;
 /**
 * <P>The basic service for managing a set of JDBC drivers.<br>
 * <B>NOTE:</B> The {@link <code>DataSource</code>} interface, new in the
 * @see Connection
 */
 public class DriverManager {
+// List of registered JDBC drivers
+private final static CopyOnWriteArrayList<Driver> registeredDrivers = new CopyOnWriteArrayList<Driver>();
+private static volatile int loginTimeout = 0;
+private static volatile java.io.PrintWriter logWriter = null;
+private static volatile java.io.PrintStream logStream = null;
+// Used in println() to synchronize logWriter
+private final static  Object logSync = new Object();
+/* Prevent the DriverManager class from being instantiated. */
+private DriverManager(){}
+/**
+* Load the initial JDBC drivers by checking the System property
+* jdbc.properties and then use the {@code ServiceLoader} mechanism
+*/
+static {
+loadInitialDrivers();
+println("JDBC DriverManager initialized");
+}
 /**
 * The <code>SQLPermission</code> constant that allows the
 * setting of the logging stream.
 * @since 1.3
 */
 * that can connect to the given URL
 * @exception SQLException if a database access error occurs
 */
 public static Driver getDriver(String url)
 throws SQLException {
-java.util.Vector drivers = null;
 println("DriverManager.getDriver(\"" + url + "\")");
-if (!initialized) {
-initialize();
-}
-synchronized (DriverManager.class){
-// use the read copy of the drivers vector
-drivers = readDrivers;
-}
 // Gets the classloader of the code that called this method, may
 // be null.
 ClassLoader callerCL = DriverManager.getCallerClassLoader();
-// Walk through the loaded drivers attempting to locate someone
+// Walk through the loaded registeredDrivers attempting to locate someone
 // who understands the given URL.
-for (int i = 0; i < drivers.size(); i++) {
+for (Driver aDriver : registeredDrivers) {
-DriverInfo di = (DriverInfo)drivers.elementAt(i);
 // If the caller does not have permission to load the driver then
 // skip it.
-if ( getCallerClass(callerCL, di.driverClassName ) !=
+if(isDriverAllowed(aDriver, callerCL)) {
-di.driverClass ) {
+try {
-println("    skipping: " + di);
+if(aDriver.acceptsURL(url)) {
-continue;
+// Success!
-}
+println("getDriver returning " + aDriver.getClass().getName());
-try {
+return (aDriver);
-println("    trying " + di);
+}
-if (di.driver.acceptsURL(url)) {
-// Success!
+} catch(SQLException sqe) {
-println("getDriver returning " + di);
+// Drop through and try the next driver.
-return (di.driver);
 }
-} catch (SQLException ex) {
+} else {
-// Drop through and try the next driver.
+println("    skipping: " + aDriver.getClass().getName());
 }
 }
 println("getDriver: no suitable driver");
 throw new SQLException("No suitable driver", "08001");
 }
 *               <code>DriverManager</code>
 * @exception SQLException if a database access error occurs
 */
 public static synchronized void registerDriver(java.sql.Driver driver)
 throws SQLException {
-if (!initialized) {
-initialize();
+/* Register the driver if it has not already been added to our list */
-}
+if(driver != null) {
+registeredDrivers.addIfAbsent(driver);
-DriverInfo di = new DriverInfo();
+} else {
+// This is for compatibility with the original DriverManager
-di.driver = driver;
+throw new NullPointerException();
-di.driverClass = driver.getClass();
+}
-di.driverClassName = di.driverClass.getName();
+println("registerDriver: " + driver);
-// Not Required -- drivers.addElement(di);
-writeDrivers.addElement(di);
-println("registerDriver: " + di);
-/* update the read copy of drivers vector */
-readDrivers = (java.util.Vector) writeDrivers.clone();
 }
 /**
 * Drops a driver from the <code>DriverManager</code>'s list.
 * @param driver the JDBC Driver to drop
 * @exception SQLException if a database access error occurs
 */
 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);
-// Walk through the loaded drivers.
+if(registeredDrivers.contains(driver)) {
-int i;
+if (isDriverAllowed(driver, callerCL)) {
-DriverInfo di = null;
+registeredDrivers.remove(driver);
-for (i = 0; i < writeDrivers.size(); i++) {
+} else {
-di = (DriverInfo)writeDrivers.elementAt(i);
+// If the caller does not have permission to load the driver then
-if (di.driver == driver) {
+// throw a SecurityException.
-break;
+throw new SecurityException();
 }
-}
+} else {
-// If we can't find the driver just return.
-if (i >= writeDrivers.size()) {
 println("    couldn't find driver to unload");
-return;
+}
-}
-// If the caller does not have permission to load the driver then
-// throw a security exception.
-if (getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) {
-throw new SecurityException();
-}
-// Remove the driver.  Other entries in drivers get shuffled down.
-writeDrivers.removeElementAt(i);
-/* update the read copy of drivers vector */
-readDrivers = (java.util.Vector) writeDrivers.clone();
 }
 /**
 * Retrieves an Enumeration with all of the currently loaded JDBC drivers
 * to which the current caller has access.
 * <CODE>d.getClass().getName()</CODE>
 *
 * @return the list of JDBC Drivers loaded by the caller's class loader
 */
 public static java.util.Enumeration<Driver> getDrivers() {
-java.util.Vector<Driver> result = new java.util.Vector<>();
+java.util.Vector<Driver> result = new java.util.Vector<Driver>();
-java.util.Vector drivers = null;
-if (!initialized) {
-initialize();
-}
-synchronized (DriverManager.class){
-// use the readcopy of drivers
-drivers  = readDrivers;
-}
 // Gets the classloader of the code that called this method, may
 // be null.
 ClassLoader callerCL = DriverManager.getCallerClassLoader();
-// Walk through the loaded drivers.
+// Walk through the loaded registeredDrivers.
-for (int i = 0; i < drivers.size(); i++) {
+for(Driver aDriver : registeredDrivers) {
-DriverInfo di = (DriverInfo)drivers.elementAt(i);
 // If the caller does not have permission to load the driver then
 // skip it.
-if ( getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) {
+if(isDriverAllowed(aDriver, callerCL)) {
-println("    skipping: " + di);
+result.addElement(aDriver);
-continue;
+} else {
-}
+println("    skipping: " + aDriver.getClass().getName());
-result.addElement(di.driver);
+}
 }
 return (result.elements());
 }
 /**
 }
 }
 //------------------------------------------------------------------------
-// Returns the class object that would be created if the code calling the
+// Indicates whether the class object that would be created if the code calling
-// driver manager had loaded the driver class, or null if the class
+// DriverManager is accessible.
-// is inaccessible.
+private static boolean isDriverAllowed(Driver driver, ClassLoader classLoader) {
-private static Class getCallerClass(ClassLoader callerClassLoader,
+boolean result = false;
-String driverClassName) {
+if(driver != null) {
-Class callerC = null;
+Class<?> aClass = null;
+try {
-try {
+aClass =  Class.forName(driver.getClass().getName(), true, classLoader);
-callerC = Class.forName(driverClassName, true, callerClassLoader);
+} catch (Exception ex) {
-}
+result = false;
-catch (Exception ex) {
+}
-callerC = null;           // being very careful
-}
+result = ( aClass == driver.getClass() ) ? true : false;
+}
-return callerC;
+return result;
 }
 private static void loadInitialDrivers() {
 String drivers;
 try {
 return null;
 }
 });
 println("DriverManager.initialize: jdbc.drivers = " + drivers);
-if (drivers == null) {
+if (drivers == null || drivers.equals("")) {
 return;
 }
-while (drivers.length() != 0) {
+String[] driversList = drivers.split(":");
-int x = drivers.indexOf(':');
+println("number of Drivers:" + driversList.length);
-String driver;
+for (String aDriver : driversList) {
-if (x < 0) {
-driver = drivers;
-drivers = "";
-} else {
-driver = drivers.substring(0, x);
-drivers = drivers.substring(x+1);
-}
-if (driver.length() == 0) {
-continue;
-}
 try {
-println("DriverManager.Initialize: loading " + driver);
+println("DriverManager.Initialize: loading " + aDriver);
-Class.forName(driver, true,
+Class.forName(aDriver, true,
 ClassLoader.getSystemClassLoader());
 } catch (Exception ex) {
 println("DriverManager.Initialize: load failed: " + ex);
 }
 }
 }
 //  Worker method called by the public getConnection() methods.
 private static Connection getConnection(
 String url, java.util.Properties info, ClassLoader callerCL) throws SQLException {
-java.util.Vector drivers = null;
 /*
 * 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.
 throw new SQLException("The url cannot be null", "08001");
 }
 println("DriverManager.getConnection(\"" + url + "\")");
-if (!initialized) {
+// Walk through the loaded registeredDrivers attempting to make a connection.
-initialize();
-}
-synchronized (DriverManager.class){
-// use the readcopy of drivers
-drivers = readDrivers;
-}
-// Walk through the loaded drivers attempting to make a connection.
 // Remember the first exception that gets raised so we can reraise it.
 SQLException reason = null;
-for (int i = 0; i < drivers.size(); i++) {
-DriverInfo di = (DriverInfo)drivers.elementAt(i);
+for(Driver aDriver : registeredDrivers) {
 // If the caller does not have permission to load the driver then
 // skip it.
-if ( getCallerClass(callerCL, di.driverClassName ) != di.driverClass ) {
+if(isDriverAllowed(aDriver, callerCL)) {
-println("    skipping: " + di);
+try {
-continue;
+println("    trying " + aDriver.getClass().getName());
-}
+Connection con = aDriver.connect(url, info);
-try {
+if (con != null) {
-println("    trying " + di);
+// Success!
-Connection result = di.driver.connect(url, info);
+println("getConnection returning " + aDriver.getClass().getName());
-if (result != null) {
+return (con);
-// Success!
+}
-println("getConnection returning " + di);
+} catch (SQLException ex) {
-return (result);
+if (reason == null) {
+reason = ex;
+}
 }
-} catch (SQLException ex) {
-if (reason == null) {
+} else {
-reason = ex;
+println("    skipping: " + aDriver.getClass().getName());
 }
-}
 }
 // if we got here nobody could connect.
 if (reason != null)    {
 println("getConnection failed: " + reason);
 println("getConnection: no suitable driver found for "+ url);
 throw new SQLException("No suitable driver found for "+ url, "08001");
 }
-// Class initialization.
-static void initialize() {
-if (initialized) {
-return;
-}
-initialized = true;
-loadInitialDrivers();
-println("JDBC DriverManager initialized");
-}
-/* Prevent the DriverManager class from being instantiated. */
-private DriverManager(){}
-/* write copy of the drivers vector */
-private static java.util.Vector writeDrivers = new java.util.Vector();
-/* write copy of the drivers vector */
-private static java.util.Vector readDrivers = new java.util.Vector();
-private static int loginTimeout = 0;
-private static java.io.PrintWriter logWriter = null;
-private static java.io.PrintStream logStream = null;
-private static boolean initialized = false;
-private static Object logSync = new Object();
 /* Returns the caller's class loader, or null if none */
 private static native ClassLoader getCallerClassLoader();
 }
-// DriverInfo is a package-private support class.
-class DriverInfo {
-Driver         driver;
-Class          driverClass;
-String         driverClassName;
-public String toString() {
-return ("driver[className=" + driverClassName + "," + driver + "]");
-}
-}

changeset 8797	e8507464a69d
parent 7803	56bc97d69d93
child 9239	f4bedba1a211