From commits-return-16099-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Thu May 12 14:05:35 2011 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 9F9725EF6 for ; Thu, 12 May 2011 14:05:35 +0000 (UTC) Received: (qmail 67131 invoked by uid 500); 12 May 2011 14:05:35 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 67084 invoked by uid 500); 12 May 2011 14:05:35 -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 67077 invoked by uid 99); 12 May 2011 14:05:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 14:05:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 14:05:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8CCB62388897; Thu, 12 May 2011 14:05:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1102317 - /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs Date: Thu, 12 May 2011 14:05:14 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110512140514.8CCB62388897@eris.apache.org> Author: tabish Date: Thu May 12 14:05:14 2011 New Revision: 1102317 URL: http://svn.apache.org/viewvc?rev=1102317&view=rev Log: https://issues.apache.org/jira/browse/AMQNET-326 For two phase TX commit the client should not attempt to initiate a local rollback if an exception occurs but leave that to the DTC. Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs?rev=1102317&r1=1102316&r2=1102317&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x/src/main/csharp/TransactionContext.cs Thu May 12 14:05:14 2011 @@ -414,7 +414,6 @@ namespace Apache.NMS.ActiveMQ { Tracer.DebugFormat("Transaction[{0}] Commit failed with error: {1}", this.transactionId, ex.Message); - AfterRollback(); try { this.connection.OnException(ex);