2020import java .io .File ;
2121import java .io .IOException ;
2222import java .sql .Connection ;
23- import java .sql .Driver ;
24- import java .sql .DriverManager ;
2523import java .sql .PreparedStatement ;
2624import java .sql .ResultSet ;
2725import java .sql .SQLException ;
@@ -1078,7 +1076,7 @@ public static void initDataSource(Properties dbProps) {
10781076 final String cloudConnectionUri = cloudDriver + "://" + cloudHost + (s_dbHAEnabled ? "," + cloudSlaves : "" ) + ":" + cloudPort + "/" + cloudDbName +
10791077 "?autoReconnect=" + cloudAutoReconnect + (url != null ? "&" + url : "" ) + (useSSL ? "&useSSL=true" : "" ) +
10801078 (s_dbHAEnabled ? "&" + cloudDbHAParams : "" ) + (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : "" );
1081- loadDbDriver ( cloudConnectionUri );
1079+ DriverLoader . loadDriver ( cloudDriver );
10821080
10831081 final ConnectionFactory cloudConnectionFactory = new DriverManagerConnectionFactory (cloudConnectionUri , cloudUsername , cloudPassword );
10841082
@@ -1109,7 +1107,7 @@ public static void initDataSource(Properties dbProps) {
11091107 final String usageConnectionUri = usageDriver + "://" + usageHost + (s_dbHAEnabled ? "," + dbProps .getProperty ("db.cloud.slaves" ) : "" ) + ":" + usagePort +
11101108 "/" + usageDbName + "?autoReconnect=" + usageAutoReconnect + (usageUrl != null ? "&" + usageUrl : "" ) +
11111109 (s_dbHAEnabled ? "&" + getDBHAParams ("usage" , dbProps ) : "" ) + (s_dbHAEnabled ? "&loadBalanceStrategy=" + loadBalanceStrategy : "" );
1112- loadDbDriver ( usageConnectionUri );
1110+ DriverLoader . loadDriver ( usageDriver );
11131111
11141112 final ConnectionFactory usageConnectionFactory = new DriverManagerConnectionFactory (usageConnectionUri , usageUsername , usagePassword );
11151113
@@ -1137,7 +1135,7 @@ public static void initDataSource(Properties dbProps) {
11371135
11381136 final String simulatorConnectionUri = simulatorDriver + "://" + simulatorHost + ":" + simulatorPort + "/" + simulatorDbName + "?autoReconnect=" +
11391137 simulatorAutoReconnect ;
1140- loadDbDriver ( simulatorConnectionUri );
1138+ DriverLoader . loadDriver ( simulatorDriver );
11411139
11421140 final ConnectionFactory simulatorConnectionFactory = new DriverManagerConnectionFactory (simulatorConnectionUri , simulatorUsername , simulatorPassword );
11431141
@@ -1157,16 +1155,6 @@ public static void initDataSource(Properties dbProps) {
11571155 }
11581156 }
11591157
1160- private static void loadDbDriver (String dbConnectionUri ) {
1161- try {
1162- Driver driver = DriverManager .getDriver (dbConnectionUri );
1163- s_logger .debug ("Successfully loaded DB driver " + driver .getClass ().getName () + " for connection " + dbConnectionUri );
1164- } catch (SQLException e ) {
1165- s_logger .error ("Failed to load DB driver for connection " + dbConnectionUri , e );
1166- throw new CloudRuntimeException ("Failed to load DB driver for connection " + dbConnectionUri , e );
1167- }
1168- }
1169-
11701158 private static String getDBHAParams (String dbName , Properties dbProps ) {
11711159 StringBuilder sb = new StringBuilder ();
11721160 sb .append ("failOverReadOnly=" + dbProps .getProperty ("db." + dbName + ".failOverReadOnly" ));
0 commit comments