activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1214574 - /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs
Date Thu, 15 Dec 2011 00:20:21 GMT
Author: tabish
Date: Thu Dec 15 00:20:21 2011
New Revision: 1214574

URL: http://svn.apache.org/viewvc?rev=1214574&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQNET-360

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs?rev=1214574&r1=1214573&r2=1214574&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/ResponseCorrelator.cs
Thu Dec 15 00:20:21 2011
@@ -50,7 +50,6 @@ namespace Apache.NMS.ActiveMQ.Transport
         {
             command.CommandId = GetNextCommandId();
 			command.ResponseRequired = false;
-			
             next.Oneway(command);
         }
 
@@ -78,7 +77,7 @@ namespace Apache.NMS.ActiveMQ.Transport
 				ExceptionResponse response = new ExceptionResponse();
 				response.Exception = brError;
 	            future.Response = response;
-	            throw priorError;
+                return future;
 	        }
 			
             next.Oneway(command);
@@ -91,22 +90,6 @@ namespace Apache.NMS.ActiveMQ.Transport
             FutureResponse future = AsyncRequest(command);
             future.ResponseTimeout = timeout;
             Response response = future.Response;
-
-            if(response != null && response is ExceptionResponse)
-            {
-                ExceptionResponse er = response as ExceptionResponse;
-                BrokerError brokerError = er.Exception;
-
-                if(brokerError == null)
-                {
-                    throw new BrokerException();
-                }
-                else
-                {
-                    throw new BrokerException(brokerError);
-                }
-            }
-
             return response;
         }
 
@@ -122,20 +105,12 @@ namespace Apache.NMS.ActiveMQ.Transport
                 {
                     requestMap.Remove(correlationId);
                     future.Response = response;
-
-                    if(response is ExceptionResponse)
-                    {
-                        ExceptionResponse er = response as ExceptionResponse;
-                        BrokerError brokerError = er.Exception;
-                        BrokerException exception = new BrokerException(brokerError);
-                        this.exceptionHandler(this, exception);
-                    }
                 }
                 else
                 {
                     if(Tracer.IsDebugEnabled)
                     {
-                        Tracer.Debug("Unknown response ID: " + response.CommandId + " for
response: " + response);
+                        Tracer.Debug("Unknown response ID: " + response.CorrelationId + "
for response: " + response);
                     }
                 }
             }



Mime
View raw message