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 2018/07/31 16:42:00 UTC

[1/2] activemq-artemis git commit: This closes #2193

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 756609f6a -> 587e45594


This closes #2193


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/587e4559
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/587e4559
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/587e4559

Branch: refs/heads/master
Commit: 587e45594caa23d0af6a3f5a43171fd9f451bcc9
Parents: 756609f 4ae8c7b
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 31 12:41:53 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 31 12:41:53 2018 -0400

----------------------------------------------------------------------
 .../artemis/core/protocol/openwire/OpenWireConnection.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[2/2] activemq-artemis git commit: ARTEMIS-1985: Switch from XA_RDONLY to XA_OK as return value for prepare transaction via OpenWire

Posted by cl...@apache.org.
ARTEMIS-1985: Switch from XA_RDONLY to XA_OK as return value for prepare transaction via OpenWire


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4ae8c7ba
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4ae8c7ba
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4ae8c7ba

Branch: refs/heads/master
Commit: 4ae8c7bab3ad27de53e63e62bbf6f892c90974e8
Parents: 756609f
Author: Benjamin Graf <be...@gmx.net>
Authored: Sat Jul 21 16:57:12 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 31 12:41:53 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/4ae8c7ba/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