Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 81e799cd2 -> 7d2b0230f
ARTEMIS-1985: Switch from XA_RDONLY to XA_OK as return value for prepare transaction via OpenWire (cherry picked from commit 4ae8c7bab3ad27de53e63e62bbf6f892c90974e8) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7d2b0230 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7d2b0230 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7d2b0230 Branch: refs/heads/2.6.x Commit: 7d2b0230f8112756ed34f9b309057db43e99e249 Parents: 81e799c Author: Benjamin Graf <[email protected]> Authored: Sat Jul 21 16:57:12 2018 +0200 Committer: Clebert Suconic <[email protected]> Committed: Tue Jul 31 12:42:47 2018 -0400 ---------------------------------------------------------------------- .../artemis/core/protocol/openwire/OpenWireConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7d2b0230/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 b5adf34..ced463b 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 @@ -1464,7 +1464,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se internalSession.resetTX(null); } - return new IntegerResponse(XAResource.XA_RDONLY); + return new IntegerResponse(XAResource.XA_OK); } @Override
