You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2011/02/21 09:47:20 UTC
svn commit: r1072883 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
Author: aadamchik
Date: Mon Feb 21 08:47:20 2011
New Revision: 1072883
URL: http://svn.apache.org/viewvc?rev=1072883&view=rev
Log:
CAY-1542 DI container is not shutting down Cayenne-managed connection pool
making sure PoolManager can be reused in the test lifecycle
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java?rev=1072883&r1=1072882&r2=1072883&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java Mon Feb 21 08:47:20 2011
@@ -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 @@ public class CayenneResources implements
return resources;
}
-
-
public CayenneResources(Map adapterMap) {
this.adapterMap = adapterMap;
}
@@ -237,7 +236,15 @@ public class CayenneResources implements
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);