From commits-return-8674-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Tue May 27 21:37:40 2008 Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 5658 invoked from network); 27 May 2008 21:37:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 May 2008 21:37:40 -0000 Received: (qmail 9295 invoked by uid 500); 27 May 2008 21:37:42 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 9238 invoked by uid 500); 27 May 2008 21:37:42 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 9229 invoked by uid 99); 27 May 2008 21:37:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 14:37:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 May 2008 21:37:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 93C3B23889FA; Tue, 27 May 2008 14:37:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@activemq.apache.org From: jgomes@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080527213717.93C3B23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {