activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r1295260 - in /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk: ./ src/main/csharp/Connection.cs
Date Wed, 29 Feb 2012 20:40:49 GMT
Author: jgomes
Date: Wed Feb 29 20:40:48 2012
New Revision: 1295260

URL: http://svn.apache.org/viewvc?rev=1295260&view=rev
Log:
Rolling back changes from previous check-in.

Modified:
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 20:40:48 2012
@@ -1 +1 @@
-/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x:1135832,1137086,1294897
+/activemq/activemq-dotnet/Apache.NMS.Stomp/branches/1.5.x:1135832,1137086,1294897,1295259

Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs?rev=1295260&r1=1295259&r2=1295260&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs Wed Feb
29 20:40:48 2012
@@ -729,27 +729,14 @@ namespace Apache.NMS.Stomp
 
         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);
             }
         }
 



Mime
View raw message