You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2016/11/03 18:06:45 UTC
[1/2] activemq git commit: Delete redundant
persistenceAdapter.getTransactionContext
Repository: activemq
Updated Branches:
refs/heads/master d54d046b8 -> d93509129
Delete redundant persistenceAdapter.getTransactionContext
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/0d90a2a6
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/0d90a2a6
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/0d90a2a6
Branch: refs/heads/master
Commit: 0d90a2a6835fc4401a44fe2d2cc391adc7fa57a5
Parents: d54d046
Author: Dominik Przybysz <dp...@touk.pl>
Authored: Mon Feb 29 13:21:58 2016 +0100
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Nov 3 14:02:01 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/store/jdbc/JDBCMessageStore.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/0d90a2a6/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
index 744220d..29db04c 100644
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
@@ -16,11 +16,6 @@
*/
package org.apache.activemq.store.jdbc;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.LinkedList;
-
import org.apache.activemq.ActiveMQMessageAudit;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ActiveMQDestination;
@@ -38,6 +33,11 @@ import org.apache.activemq.wireformat.WireFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.LinkedList;
+
/**
*
*/
@@ -86,7 +86,6 @@ public class JDBCMessageStore extends AbstractMessageStore {
private void recordDestinationCreation(ActiveMQDestination destination) throws IOException {
TransactionContext c = persistenceAdapter.getTransactionContext();
try {
- c = persistenceAdapter.getTransactionContext();
if (adapter.doGetLastAckedDurableSubscriberMessageId(c, destination, destination.getQualifiedName(), destination.getQualifiedName()) < 0) {
adapter.doRecordDestination(c, destination);
}
@@ -273,7 +272,6 @@ public class JDBCMessageStore extends AbstractMessageStore {
// Get all the Message ids out of the database.
TransactionContext c = persistenceAdapter.getTransactionContext();
try {
- c = persistenceAdapter.getTransactionContext();
adapter.doRecover(c, destination, new JDBCMessageRecoveryListener() {
@Override
public boolean recoverMessage(long sequenceId, byte[] data) throws Exception {
[2/2] activemq git commit: This closes #171
Posted by ha...@apache.org.
This closes #171
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/d9350912
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/d9350912
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/d9350912
Branch: refs/heads/master
Commit: d9350912984f12356e9d51b0f00b5a28f5cfa58d
Parents: d54d046 0d90a2a
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Thu Nov 3 14:02:28 2016 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Nov 3 14:02:28 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/store/jdbc/JDBCMessageStore.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------