activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r660722 - /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Stomp/StompWireFormat.cs
Date Tue, 27 May 2008 21:37:17 GMT
Author: jgomes
Date: Tue May 27 14:37:17 2008
New Revision: 660722

URL: http://svn.apache.org/viewvc?rev=660722&view=rev
Log:
Fix merge errors that introduced redundant code.

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

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Stomp/StompWireFormat.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Stomp/StompWireFormat.cs?rev=660722&r1=660721&r2=660722&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Stomp/StompWireFormat.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Stomp/StompWireFormat.cs
Tue May 27 14:37:17 2008
@@ -258,7 +258,7 @@
 			message.Destination = StompHelper.ToDestination(RemoveHeader(headers, "destination"));
 			message.ReplyTo = StompHelper.ToDestination(RemoveHeader(headers, "reply-to"));
 			message.TargetConsumerId = StompHelper.ToConsumerId(RemoveHeader(headers, "subscription"));
-			message.CorrelationId = ToString(headers["correlation-id"]);
+			message.CorrelationId = RemoveHeader(headers, "correlation-id");
 			message.MessageId = StompHelper.ToMessageId(RemoveHeader(headers, "message-id"));
 			message.Persistent = StompHelper.ToBool(RemoveHeader(headers, "persistent"), true);
 			
@@ -271,10 +271,6 @@
 			header = RemoveHeader(headers, "expires");
 			if (header != null) message.Expiration = Int64.Parse(header);
 			
-			header = RemoveHeader(headers, "timestamp");
-			if (header != null) message.Timestamp = Int64.Parse(header);
-
-			
 			// now lets add the generic headers
 			foreach (string key in headers.Keys)
 			{



Mime
View raw message