db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1138412 - in /db/derby/code/branches/10.8: ./ java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Wed, 22 Jun 2011 11:40:44 GMT
Author: kahatlen
Date: Wed Jun 22 11:40:43 2011
New Revision: 1138412

URL: http://svn.apache.org/viewvc?rev=1138412&view=rev
Log:
DERBY-5239: Remove usages of DriverManager to obtain an Embedded Connection in Derby Server

Merged fix from trunk (revisions 1126468 and 1136397).

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 22 11:40:43 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133741,1133752,1136844
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741,1096890,1097247,1097249,1097460,1097469,1097471,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132860,1132928,1133741,1133752,1136397,1136844

Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1138412&r1=1138411&r2=1138412&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Wed Jun 22 11:40:43 2011
@@ -49,7 +49,6 @@ import java.security.PrivilegedActionExc
 import java.security.PrivilegedExceptionAction;
 import java.sql.Connection;
 import java.sql.Driver;
-import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.util.ArrayList;
@@ -1004,8 +1003,7 @@ public final class NetworkServerControlI
 					}
 
 					// start the server.
-					Class.forName(CLOUDSCAPE_DRIVER).newInstance();
-					cloudscapeDriver = DriverManager.getDriver(Attribute.PROTOCOL);
+					cloudscapeDriver = (Driver) Class.forName(CLOUDSCAPE_DRIVER).newInstance();
 
 				}
 				catch (Exception e) {
@@ -3827,7 +3825,7 @@ public final class NetworkServerControlI
 	 	try {
 			//Note, we add database to the url so that we can allow additional
 			//url attributes
-			Connection conn = DriverManager.getConnection(Attribute.PROTOCOL+database, p);
+			Connection conn = getDriver().connect(Attribute.PROTOCOL+database, p);
 			// send warnings
 			SQLWarning warn = conn.getWarnings();
 			if (warn != null)



Mime
View raw message