You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2016/12/03 16:56:26 UTC
[32/50] tomee git commit: Fix compile errors
Fix compile errors
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/99515710
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/99515710
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/99515710
Branch: refs/heads/tomee-1.7.x
Commit: 99515710279e86ac39a609599b79a552e0b8b574
Parents: f3ad540
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Thu Aug 11 01:28:16 2016 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Thu Aug 11 01:28:16 2016 +0100
----------------------------------------------------------------------
.../openejb/resource/jdbc/XAPoolTest.java | 20 +++++++++++++-------
.../tomee/jdbc/TomcatXADataSourceTest.java | 12 +++++++++---
2 files changed, 22 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/99515710/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XAPoolTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XAPoolTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XAPoolTest.java
index 2ae7919..71177d3 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XAPoolTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/XAPoolTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.openejb.resource.jdbc;
-import org.apache.commons.dbcp2.BasicDataSource;
-import org.apache.commons.dbcp2.managed.ManagedConnection;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp.managed.ManagedConnection;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.resource.jdbc.dbcp.ManagedDataSourceWithRecovery;
@@ -25,7 +25,6 @@ import org.apache.openejb.resource.jdbc.pool.DefaultDataSourceCreator;
import org.apache.openejb.testing.Configuration;
import org.apache.openejb.testing.Module;
import org.apache.openejb.testng.PropertiesBuilder;
-import org.hsqldb.jdbc.pool.JDBCXAConnectionWrapper;
import org.hsqldb.jdbc.pool.JDBCXADataSource;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -75,6 +74,7 @@ public class XAPoolTest {
.p("xadb.xaDataSource", "xa")
.p("xadb.JtaManaged", "true")
.p("xadb.MaxIdle", "25")
+ .p("xadb.MaxActive", "25")
.p("xadb.MaxTotal", "25")
.p("xadb.InitialSize", "3")
@@ -88,19 +88,25 @@ public class XAPoolTest {
assertEquals(0, tds.getNumIdle()); // db not yet used so no connection at all (dbcp behavior)
- try (final Connection c = ds.getConnection()) {
+ Connection c = null;
+ try {
+ c = ds.getConnection();
assertNotNull(c);
final Connection connection = c.getMetaData().getConnection(); // just to do something and force the connection init
assertThat(connection, instanceOf(ManagedConnection.class));
- assertTrue(connection.toString().contains("URL=jdbc:hsqldb:mem:dbcpxa, UserName=SA, HSQL Database Engine Driver"));
- } // here we close the connection so we are back in the initial state
+ assertTrue(connection.toString().contains("jdbc:hsqldb:mem:dbcpxa, UserName=SA, HSQL Database Engine Driver"));
+ } finally {
+ if (c != null) {
+ c.close();
+ }
+ }
assertEquals(0, tds.getNumActive());
assertEquals(3, tds.getNumIdle());
for (int it = 0; it < 5; it++) { // ensures it always works and not only the first time
- final Collection<Connection> connections = new ArrayList<>(25);
+ final Collection<Connection> connections = new ArrayList<Connection>(25);
for (int i = 0; i < 25; i++) {
final Connection connection = ds.getConnection();
connections.add(connection);
http://git-wip-us.apache.org/repos/asf/tomee/blob/99515710/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatXADataSourceTest.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatXADataSourceTest.java b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatXADataSourceTest.java
index 5863384..96739d0 100644
--- a/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatXADataSourceTest.java
+++ b/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatXADataSourceTest.java
@@ -84,18 +84,24 @@ public class TomcatXADataSourceTest {
assertEquals(3, tds.getIdle()); // InitSize
- try (final Connection c = ds.getConnection()) {
+ Connection c = null;
+ try {
+ c = ds.getConnection();
assertNotNull(c);
final Connection connection = c.getMetaData().getConnection(); // just to do something and force the connection init
assertThat(connection, instanceOf(JDBCXAConnectionWrapper.class));
- } // here we close the connection so we are back in the initial state
+ } finally {
+ if (c != null) {
+ c.close();
+ }
+ }
assertEquals(0, tds.getActive());
assertEquals(3, tds.getIdle());
for (int it = 0; it < 5; it++) { // ensures it always works and not only the first time
- final Collection<Connection> connections = new ArrayList<>(25);
+ final Collection<Connection> connections = new ArrayList<Connection>(25);
for (int i = 0; i < 25; i++) {
final Connection connection = ds.getConnection();
connections.add(connection);