Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-02-23 02:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

This closes #96 Openwire XA fix

Browse Source
This commit is contained in:
Clebert Suconic 2015-07-28 09:50:29 -04:00
commit c8d053ede8
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
View File

@ -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))

11
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
View File

@ -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());

13
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
View File

@ -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());