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)
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 @@
/// 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
}
}
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 @@
/// 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 @@
/// be thrown.
/// </summary>
void Enlist(Transaction tx);
+
+ bool EnlistsMsDtcNativeResource { get; set; }
#endif
}
}