activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r1689528 - in /activemq/activemq-dotnet/Apache.NMS/branches/1.7.x: ./ src/main/csharp/INetTxConnection.cs src/main/csharp/INetTxSession.cs
Date Tue, 07 Jul 2015 00:01:40 GMT
Author: jgomes
Date: Tue Jul  7 00:01:40 2015
New Revision: 1689528

URL: http://svn.apache.org/r1689528
Log:
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)

Modified:
    activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/   (props changed)
    activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxConnection.cs
    activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxSession.cs

Propchange: activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  7 00:01:40 2015
@@ -1 +1,2 @@
 /activemq/activemq-dotnet/Apache.NMS/branches/1.5.x:1143990,1185320
+/activemq/activemq-dotnet/Apache.NMS/trunk:1689516

Modified: activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxConnection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxConnection.cs?rev=1689528&r1=1689527&r2=1689528&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxConnection.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxConnection.cs
Tue Jul  7 00:01:40 2015
@@ -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
     }
 }

Modified: activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxSession.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxSession.cs?rev=1689528&r1=1689527&r2=1689528&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxSession.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS/branches/1.7.x/src/main/csharp/INetTxSession.cs Tue
Jul  7 00:01:40 2015
@@ -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
     }
 }



Mime
View raw message