Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48C5B18F08 for ; Mon, 6 Jul 2015 22:41:05 +0000 (UTC) Received: (qmail 86102 invoked by uid 500); 6 Jul 2015 22:41:05 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 86060 invoked by uid 500); 6 Jul 2015 22:41:05 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 86051 invoked by uid 99); 6 Jul 2015 22:41:05 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jul 2015 22:41:05 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id F2573AC0330 for ; Mon, 6 Jul 2015 22:41:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1689516 - in /activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp: INetTxConnection.cs INetTxSession.cs Date: Mon, 06 Jul 2015 22:41:04 -0000 To: commits@activemq.apache.org From: jgomes@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150706224104.F2573AC0330@hades.apache.org> Author: jgomes Date: Mon Jul 6 22:41:04 2015 New Revision: 1689516 URL: http://svn.apache.org/r1689516 Log: 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/trunk/src/main/csharp/INetTxConnection.cs activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs?rev=1689516&r1=1689515&r2=1689516&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs (original) +++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxConnection.cs Mon Jul 6 22:41:04 2015 @@ -40,6 +40,10 @@ namespace Apache.NMS /// Creates a INetTxSession object and enlists in the specified Transaction. /// INetTxSession CreateNetTxSession(Transaction tx); + + INetTxSession CreateNetTxSession(bool enlistsNativeMsDtcResource); + + INetTxSession CreateNetTxSession(Transaction tx, bool enlistsNativeMsDtcResource); #endif } } Modified: activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs?rev=1689516&r1=1689515&r2=1689516&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs (original) +++ activemq/activemq-dotnet/Apache.NMS/trunk/src/main/csharp/INetTxSession.cs Mon Jul 6 22:41:04 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. /// void Enlist(Transaction tx); + + bool EnlistsMsDtcNativeResource { get; set; } #endif } }