CAY-1542 DI container is not shutting down Cayenne-managed connection pool
making sure PoolManager can be reused in the test lifecycle
(cherry picked from commit 7e6228c0a6e0ddda1a8b92c52e24e9cb083b20ea)
git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/tags/3.1M2@1072886 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
index b721f86..8fec8d8 100644
--- a/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
+++ b/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.unit;
import java.io.InputStream;
+import java.sql.SQLException;
import java.util.Map;
import javax.sql.DataSource;
@@ -107,8 +108,6 @@
return resources;
}
-
-
public CayenneResources(Map adapterMap) {
this.adapterMap = adapterMap;
}
@@ -237,7 +236,15 @@
1,
1,
connectionInfo.getUserName(),
- connectionInfo.getPassword());
+ connectionInfo.getPassword()) {
+
+ @Override
+ public void shutdown() throws SQLException {
+ // noop - make sure we are not shutdown by the test scope, but at the
+ // same time PoolManager methods are exposed (so we can't wrap
+ // PoolManager)
+ }
+ };
}
catch (Exception ex) {
logger.error("Can not create shared data source.", ex);
