You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by dj...@apache.org on 2007/06/08 18:29:45 UTC
svn commit: r545553 -
/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
Author: djd
Date: Fri Jun 8 09:29:44 2007
New Revision: 545553
URL: http://svn.apache.org/viewvc?view=rev&rev=545553
Log:
DERBY-2788 (quick fix) Make acceptsURL return false if the driver has been shutdown.
Quick fix because I think there are some issues with the behaviour of this class.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java?view=diff&rev=545553&r1=545552&r2=545553
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/jdbc/AutoloadedDriver.java Fri Jun 8 09:29:44 2007
@@ -92,7 +92,7 @@
// the application is looking for a connection from some other
// driver.
//
- return InternalDriver.embeddedDriverAcceptsURL(url);
+ return !_engineForcedDown && InternalDriver.embeddedDriverAcceptsURL(url);
}
@@ -176,7 +176,7 @@
** Retrieve the driver which is specific to our JDBC level.
** We defer real work to this specific driver.
*/
- public static Driver getDriverModule() throws SQLException {
+ static Driver getDriverModule() throws SQLException {
if ( _engineForcedDown )
{
@@ -193,7 +193,7 @@
/*
** Record which driver module actually booted.
*/
- protected static void registerDriverModule( Driver driver )
+ static void registerDriverModule( Driver driver )
{
_driverModule = driver;
_engineForcedDown = false;
@@ -203,7 +203,7 @@
** Unregister the driver. This happens when the engine is
** forcibly shut down.
*/
- protected static void unregisterDriverModule()
+ static void unregisterDriverModule()
{
_driverModule = null;
_engineForcedDown = true;