You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/07/21 20:36:31 UTC
[14/16] tomee git commit: static connection holder doesnt exist
anymore
static connection holder doesnt exist anymore
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/39cbaca1
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/39cbaca1
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/39cbaca1
Branch: refs/heads/tomee-1.7.x
Commit: 39cbaca105ab2f087d3ebc73c9bec728e7cd6cd8
Parents: 9f6edb4
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Thu Jul 16 14:26:06 2015 +0200
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Tue Jul 21 13:43:14 2015 +0100
----------------------------------------------------------------------
.../resource/jdbc/UTManagedDataSourceTest.java | 27 +++++---------------
1 file changed, 6 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/39cbaca1/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java
index 146a5b3..77f9049 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/UTManagedDataSourceTest.java
@@ -19,14 +19,18 @@ package org.apache.openejb.resource.jdbc;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection;
import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.Module;
-import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
import javax.annotation.Resource;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
@@ -34,18 +38,8 @@ import javax.ejb.Singleton;
import javax.ejb.TransactionManagement;
import javax.ejb.TransactionManagementType;
import javax.sql.DataSource;
-import javax.transaction.Transaction;
import javax.transaction.UserTransaction;
-import java.lang.reflect.Field;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Map;
-import java.util.Properties;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -209,15 +203,6 @@ public class UTManagedDataSourceTest {
assertFalse(exists(12));
}
- @After
- public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
- final Field map = ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX_BY_DS");
- map.setAccessible(true);
- final Map<DataSource, Map<Transaction, Connection>> instance = (Map<DataSource, Map<Transaction, Connection>>) map.get(null);
- assertEquals(1, instance.size());
- assertEquals(0, instance.values().iterator().next().size());
- }
-
private static boolean exists(final int id) throws Exception {
final Connection connection = DriverManager.getConnection(URL, USER, PASSWORD);
final Statement statement = connection.createStatement();