You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/28 15:50:55 UTC
[1/2] activemq-artemis git commit: This closes #96 Openwire XA fix
Repository: activemq-artemis
Updated Branches:
refs/heads/master d002da850 -> c8d053ede
This closes #96 Openwire XA fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c8d053ed
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c8d053ed
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c8d053ed
Branch: refs/heads/master
Commit: c8d053ede8e7df02d47dff73eb69a8a9593d5fc9
Parents: d002da8 abcde1c
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 28 09:50:29 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 28 09:50:29 2015 -0400
----------------------------------------------------------------------
.../core/protocol/openwire/OpenWireConnection.java | 1 +
.../protocol/openwire/OpenWireProtocolManager.java | 11 +++++++++++
.../artemis/core/protocol/openwire/amq/AMQSession.java | 13 +++++++++++++
3 files changed, 25 insertions(+)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: added Openwire XA end call
Posted by cl...@apache.org.
added Openwire XA end call
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/abcde1c1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/abcde1c1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/abcde1c1
Branch: refs/heads/master
Commit: abcde1c1f3674e4f8696b68ddfbb59498a2118d8
Parents: d002da8
Author: Andy Taylor <an...@gmail.com>
Authored: Tue Jul 28 09:06:40 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 28 09:50:29 2015 -0400
----------------------------------------------------------------------
.../core/protocol/openwire/OpenWireConnection.java | 1 +
.../protocol/openwire/OpenWireProtocolManager.java | 11 +++++++++++
.../artemis/core/protocol/openwire/amq/AMQSession.java | 13 +++++++++++++
3 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/abcde1c1/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index d943af1..6c6bff3 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -1356,6 +1356,7 @@ public class OpenWireConnection implements RemotingConnection, CommandVisitor
@Override
public Response processEndTransaction(TransactionInfo info) throws Exception
{
+ protocolManager.endTransaction(info);
TransactionId txId = info.getTransactionId();
if (!txMap.containsKey(txId))
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/abcde1c1/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index 15cb9e2..d245985 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -711,6 +711,17 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, No
server.destroyQueue(new SimpleString(q));
}
+
+ public void endTransaction(TransactionInfo info) throws Exception
+ {
+ AMQSession txSession = transactions.get(info.getTransactionId());
+
+ if (txSession != null)
+ {
+ txSession.endTransaction(info);
+ }
+ }
+
public void commitTransactionOnePhase(TransactionInfo info) throws Exception
{
AMQSession txSession = transactions.get(info.getTransactionId());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/abcde1c1/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
index 4f951fe..ef64b6c 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
@@ -396,6 +396,19 @@ public class AMQSession implements SessionCallback
this.isTx = true;
}
+
+ public void endTransaction(TransactionInfo info) throws Exception
+ {
+ checkTx(info.getTransactionId());
+
+ if (txId.isXATransaction())
+ {
+ XATransactionId xid = (XATransactionId) txId;
+ XidImpl coreXid = new XidImpl(xid.getBranchQualifier(), xid.getFormatId(), xid.getGlobalTransactionId());
+ this.coreSession.xaEnd(coreXid);
+ }
+ }
+
public void commitOnePhase(TransactionInfo info) throws Exception
{
checkTx(info.getTransactionId());