[jtrac-svn] SF.net SVN: j-trac:[1474] trunk/jtrac/src/main/java/info/jtrac/config/ DataSourceFactoryBean.java

[<udi...@us...>]

Revision: 1474
          http://sourceforge.net/p/j-trac/code/1474
Author:   udittmer
Date:     2023-04-18 09:37:40 +0000 (Tue, 18 Apr 2023)
Log Message:
-----------
don't use JDBC driver class name when initializing HikariCP

Modified Paths:
--------------
    trunk/jtrac/src/main/java/info/jtrac/config/DataSourceFactoryBean.java

Modified: trunk/jtrac/src/main/java/info/jtrac/config/DataSourceFactoryBean.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/config/DataSourceFactoryBean.java	2023-04-15 10:51:10 UTC (rev 1473)
+++ trunk/jtrac/src/main/java/info/jtrac/config/DataSourceFactoryBean.java	2023-04-18 09:37:40 UTC (rev 1474)
@@ -155,18 +155,18 @@
             dataSource = (DataSource) factoryBean.getObject();
         } else if(url.startsWith("jdbc:hsqldb:file")) {
             logger.info("embedded HSQLDB mode detected, using Spring single connection data source");
+
             SingleConnectionDataSource ds = new SingleConnectionDataSource();
             ds.setUrl(url);
-            ds.setDriverClassName(driverClassName);
             ds.setUsername(username);
             ds.setPassword(password);
             ds.setSuppressClose(true);
+
             dataSource = ds;
         } else {
             logger.info("Not using embedded HSQLDB or JNDI datasource, using HikariCP connection pool");
 
 			HikariConfig config = new HikariConfig();
-			config.setDriverClassName(driverClassName);
 			config.setJdbcUrl(url);
             config.setUsername(username);
             config.setPassword(password);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.