Author: jgomes
Date: Wed Feb 29 20:39:29 2012
New Revision: 1295258
URL: http://svn.apache.org/viewvc?rev=1295258&view=rev
Log:
Rolling back changes from previous check-in.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 20:39:29 2012
@@ -1,3 +1,3 @@
-/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:1082291,1135831,1137081,1171843,1171874,1177390,1177395,1186568,1187123,1238881,1293360,1294890
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:1082291,1135831,1137081,1171843,1171874,1177390,1177395,1186568,1187123,1238881,1293360,1294890,1295257
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0:788230,788233,790183
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=1295258&r1=1295257&r2=1295258&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
Wed Feb 29 20:39:29 2012
@@ -1005,27 +1005,14 @@ namespace Apache.NMS.ActiveMQ
internal void OnException(Exception error)
{
- if(this.transport.IsFaultTolerant)
- {
- Tracer.ErrorFormat("Attempting recovery from
Exception: {0}", error.Message);
- while(null != (error = error.InnerException))
- {
- Tracer.ErrorFormat(" {0}",
error.Message);
- }
+ // Will fire an exception listener callback if there's
any set.
+ OnAsyncException(error);
- OnTransportInterrupted(this.transport);
- }
- else
+ if(!this.closing.Value && !this.closed.Value)
{
- // Will fire an exception listener callback if
there's any set.
- OnAsyncException(error);
-
- if(!this.closing.Value && !this.closed.Value)
- {
- // Perform the actual work in another
thread to avoid lock contention
- // and allow the caller to continue on
in its error cleanup.
-
executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
- }
+ // Perform the actual work in another thread to
avoid lock contention
+ // and allow the caller to continue on in its
error cleanup.
+
executor.QueueUserWorkItem(AsyncOnExceptionHandler, error);
}
}
