You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/31 15:21:28 UTC
git commit: TOMEE-1435 ensure to unwrap proxies when trying to
destroy datasources
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 29832343c -> 26afc85fb
TOMEE-1435 ensure to unwrap proxies when trying to destroy datasources
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/26afc85f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/26afc85f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/26afc85f
Branch: refs/heads/tomee-1.7.x
Commit: 26afc85fb30ee9b86e27031aefd9d580e3a8a299
Parents: 2983234
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Oct 31 15:21:06 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Oct 31 15:21:06 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/openejb/resource/jdbc/DataSourceFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/26afc85f/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
index 16b31da..219283a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
@@ -359,7 +359,7 @@ public class DataSourceFactory {
}
public static boolean knows(final Object object) {
- return object instanceof CommonDataSource && creatorByDataSource.containsKey(object);
+ return object instanceof CommonDataSource && creatorByDataSource.containsKey(realInstance(object));
}
// TODO: should we get a get and a clear method instead of a single one?