Merged revision(s) 1689516 from activemq/activemq-dotnet/Apache.NMS/trunk: Apply patch from Jose Alvarado. Thanks, Jose! Fixes [AMQNET-503]. (See https://issues.apache.org/jira/browse/AMQNET-503)
Project: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/commit/17f55c2a Tree: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/tree/17f55c2a Diff: http://git-wip-us.apache.org/repos/asf/activemq-nms-api/diff/17f55c2a Branch: refs/heads/1.7.x Commit: 17f55c2a54ddcf3bcd35b3410e9c26028201ee0f Parents: d94e578 Author: Jim Gomes <jgo...@apache.org> Authored: Tue Jul 7 00:01:40 2015 +0000 Committer: Jim Gomes <jgo...@apache.org> Committed: Tue Jul 7 00:01:40 2015 +0000 ---------------------------------------------------------------------- src/main/csharp/INetTxConnection.cs | 4 ++++ src/main/csharp/INetTxSession.cs | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/17f55c2a/src/main/csharp/INetTxConnection.cs ---------------------------------------------------------------------- diff --git a/src/main/csharp/INetTxConnection.cs b/src/main/csharp/INetTxConnection.cs index cf955fe..12ce89c 100644 --- a/src/main/csharp/INetTxConnection.cs +++ b/src/main/csharp/INetTxConnection.cs @@ -40,6 +40,10 @@ namespace Apache.NMS /// Creates a INetTxSession object and enlists in the specified Transaction. /// </summary> INetTxSession CreateNetTxSession(Transaction tx); + + INetTxSession CreateNetTxSession(bool enlistsNativeMsDtcResource); + + INetTxSession CreateNetTxSession(Transaction tx, bool enlistsNativeMsDtcResource); #endif } } http://git-wip-us.apache.org/repos/asf/activemq-nms-api/blob/17f55c2a/src/main/csharp/INetTxSession.cs ---------------------------------------------------------------------- diff --git a/src/main/csharp/INetTxSession.cs b/src/main/csharp/INetTxSession.cs index 259ba3f..603460e 100644 --- a/src/main/csharp/INetTxSession.cs +++ b/src/main/csharp/INetTxSession.cs @@ -29,7 +29,7 @@ namespace Apache.NMS /// The NMS Provider implements this interface by participating in the current ambient transaction /// as defined by the System.Transactions.Transaction.Current static member. Whenever a new /// Transaction is entered the NMS provider should enlist in that transaction. When there is no - /// ambient transaction then the NMS Prodiver should allow the INetTxSession instance to behave + /// ambient transaction then the NMS Provider should allow the INetTxSession instance to behave /// as a session that is in Auto Acknowledge mode. /// /// Calling the Commit or Rollback methods on a INetTxSession instance should throw an exception @@ -49,6 +49,8 @@ namespace Apache.NMS /// be thrown. /// </summary> void Enlist(Transaction tx); + + bool EnlistsMsDtcNativeResource { get; set; } #endif } }