You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2015/05/20 14:43:35 UTC
[6/8] activemq git commit: more derby shutdown woes resolved
more derby shutdown woes resolved
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/baa10ed3
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/baa10ed3
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/baa10ed3
Branch: refs/heads/master
Commit: baa10ed33e870cacf4eabcfc4167887c89b7a0d1
Parents: 3fdf986
Author: gtully <ga...@gmail.com>
Authored: Wed May 20 09:53:32 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed May 20 09:57:05 2015 +0100
----------------------------------------------------------------------
.../org/apache/activemq/store/jdbc/DataSourceServiceSupport.java | 4 ----
.../apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java | 1 +
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/baa10ed3/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
index e36a66b..9790d3d 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/DataSourceServiceSupport.java
@@ -98,10 +98,6 @@ abstract public class DataSourceServiceSupport extends LockableServiceSupport {
final EmbeddedDataSource ds = new EmbeddedDataSource();
ds.setDatabaseName("derbydb");
ds.setCreateDatabase("create");
- try {
- ds.getConnection().close();
- } catch (SQLException ignored) {
- }
return ds;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/baa10ed3/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
index 514dd4a..4881b2f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCNetworkBrokerDetachTest.java
@@ -26,6 +26,7 @@ public class JDBCNetworkBrokerDetachTest extends NetworkBrokerDetachTest {
JDBCPersistenceAdapter jdbc = new JDBCPersistenceAdapter();
EmbeddedDataSource dataSource = (EmbeddedDataSource) jdbc.getDataSource();
dataSource.setDatabaseName(broker.getBrokerName());
+ dataSource.getConnection().close(); // ensure derby for brokerName is initialized
broker.setPersistenceAdapter(jdbc);
broker.setUseVirtualTopics(false);
}