You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/08/29 17:29:00 UTC
svn commit: r1621326 - in
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x: ./
src/main/csharp/NetTxTransactionContext.cs
Author: tabish
Date: Fri Aug 29 15:29:00 2014
New Revision: 1621326
URL: http://svn.apache.org/r1621326
Log:
https://issues.apache.org/jira/browse/AMQNET-474
Fire only async error notifications if an error occurs during the transaction operations.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/NetTxTransactionContext.cs
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/
------------------------------------------------------------------------------
Merged /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk:r1621318
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/NetTxTransactionContext.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/NetTxTransactionContext.cs?rev=1621326&r1=1621325&r2=1621326&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/NetTxTransactionContext.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.6.x/src/main/csharp/NetTxTransactionContext.cs Fri Aug 29 15:29:00 2014
@@ -252,7 +252,7 @@ namespace Apache.NMS.ActiveMQ
preparingEnlistment.ForceRollback();
try
{
- this.connection.OnException(ex);
+ this.connection.OnAsyncException(ex);
}
catch (Exception error)
{
@@ -301,8 +301,8 @@ namespace Apache.NMS.ActiveMQ
Tracer.DebugFormat("Transaction[{0}] Commit failed with error: {1}",
this.transactionId, ex.Message);
try
- {
- this.connection.OnException(ex);
+ {
+ this.connection.OnAsyncException(ex);
}
catch (Exception error)
{
@@ -362,8 +362,8 @@ namespace Apache.NMS.ActiveMQ
AfterRollback();
enlistment.Done();
try
- {
- this.connection.OnException(ex);
+ {
+ this.connection.OnAsyncException(ex);
}
catch (Exception error)
{
@@ -422,8 +422,8 @@ namespace Apache.NMS.ActiveMQ
this.transactionId, ex.Message);
AfterRollback();
try
- {
- this.connection.OnException(ex);
+ {
+ this.connection.OnAsyncException(ex);
}
catch (Exception error)
{