merge #268 - ARTEMIS-302 more changes around XA reliability (resilience on failures)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1f3d189d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1f3d189d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1f3d189d Branch: refs/heads/master Commit: 1f3d189dc88442f29c5211a678bdef97c895cf16 Parents: a2c8e6b af1f79b Author: Andy Taylor <[email protected]> Authored: Wed Dec 16 15:22:23 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Wed Dec 16 15:22:23 2015 +0000 ---------------------------------------------------------------------- .../core/client/impl/ClientSessionImpl.java | 14 +- .../activemq/artemis/ra/ActiveMQRALogger.java | 10 +- .../artemis/ra/ActiveMQRAManagedConnection.java | 2 +- .../artemis/ra/ActiveMQRAXAResource.java | 21 +- .../artemis/ra/ActiveMQResourceAdapter.java | 188 +++--- .../artemis/ra/inflow/ActiveMQActivation.java | 76 +-- .../ra/inflow/ActiveMQMessageHandler.java | 3 +- .../impl/journal/JournalStorageManager.java | 3 +- .../core/server/cluster/impl/BridgeImpl.java | 23 + .../core/server/impl/ServerConsumerImpl.java | 3 +- .../core/server/impl/ServerSessionImpl.java | 9 +- .../core/transaction/impl/TransactionImpl.java | 148 ++-- .../transaction/impl/TransactionImplTest.java | 673 +++++++++++++++++++ .../byteman/ClusteredBridgeReconnectTest.java | 228 +++++++ .../byteman/ConcurrentDeliveryCancelTest.java | 92 +-- .../tests/extras/byteman/TimeoutXATest.java | 12 +- ...MDBMultipleHandlersServerDisconnectTest.java | 116 +++- .../cluster/bridge/BridgeReconnectTest.java | 4 + .../failover/AsynchronousFailoverTest.java | 8 +- .../integration/ra/ResourceAdapterTest.java | 48 +- .../integration/xa/BasicXaRecoveryTest.java | 3 + .../tests/unit/ra/ResourceAdapterTest.java | 24 +- 22 files changed, 1371 insertions(+), 337 deletions(-) ----------------------------------------------------------------------
