CSPACE-5782 Replace DataSource getConnection with DriverManager.getConnection(),...

diff --git a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
index 50dd95f26543295078d3c22d1654cdd2d91a1365..1ed4c4c5ff69f7b85604d71e6db18b3a5be18e21 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
@@ -29,6 +29,7 @@ import javax.naming.NamingException;
 import javax.sql.DataSource;\r
 import java.sql.DatabaseMetaData;\r
 import java.sql.Connection;\r
+import java.sql.DriverManager;\r
 import java.sql.ResultSet;\r
 import java.sql.ResultSetMetaData;\r
 import java.sql.SQLException;\r
@@ -139,10 +140,19 @@ public class JDBCTools {
                String urlTemplate = dataSource.getUrl();\r
                String databaseName = getDatabaseName(repositoryName);\r
                String connectionUrl = urlTemplate.replace(URL_DATABASE_NAME, databaseName);\r
-               dataSource.setUrl(connectionUrl);\r
+\r
+               // ATTENTION!\r
+               // Turns out the Tomcat BasicDataSource used a connection pool, so changing the url does not\r
+               // get you a corresponding connection. Use the more basic implementation for now, unless\r
+               // and until we do things right by creating additional JNDI data sources.\r
+               \r
+               //dataSource.setUrl(connectionUrl);\r
+               String user = dataSource.getUsername();\r
+               String password = dataSource.getPassword();\r
                \r
                try {\r
-                       conn = dataSource.getConnection();\r
+                       //conn = dataSource.getConnection();\r
+                       conn = DriverManager.getConnection(connectionUrl, user, password);\r
                        result = conn;\r
                        if (logger.isTraceEnabled() == true && conn != null) {\r
                                logger.trace(String.format("Connection made to repository = '%s' using datasource = '%s'", repositoryName, dataSourceName));\r