Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 42697 invoked from network); 20 Jul 2010 23:20:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Jul 2010 23:20:19 -0000 Received: (qmail 40099 invoked by uid 500); 20 Jul 2010 23:20:19 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 40040 invoked by uid 500); 20 Jul 2010 23:20:18 -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 40033 invoked by uid 99); 20 Jul 2010 23:20:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jul 2010 23:20:18 +0000 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, 20 Jul 2010 23:20:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 176BA2388C16; Tue, 20 Jul 2010 23:19:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r966051 - in /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp: Connection.cs Session.cs Date: Tue, 20 Jul 2010 23:19:23 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100720231923.176BA2388C16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tabish Date: Tue Jul 20 23:19:22 2010 New Revision: 966051 URL: http://svn.apache.org/viewvc?rev=966051&view=rev Log: https://issues.apache.org/activemq/browse/AMQNET-264 Use new URISupport methods to preserve the options when non-destructive extraction is what we want. Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Connection.cs activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs 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=966051&r1=966050&r2=966051&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 Tue Jul 20 23:19:22 2010 @@ -339,7 +339,8 @@ namespace Apache.NMS.Stomp // Set properties on session using parameters prefixed with "session." StringDictionary options = URISupport.ParseQuery(this.brokerUri.Query); - URISupport.SetProperties(session, options, "session."); + options = URISupport.GetProperties(options, "session."); + URISupport.SetProperties(session, options); if(IsStarted) { Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs?rev=966051&r1=966050&r2=966051&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Session.cs Tue Jul 20 23:19:22 2010 @@ -17,6 +17,7 @@ using System; using System.Collections; +using System.Collections.Specialized; using System.Threading; using Apache.NMS.Stomp.Commands; using Apache.NMS.Stomp.Util; @@ -668,7 +669,8 @@ namespace Apache.NMS.Stomp Destination amqDestination = destination as Destination; if(amqDestination != null && amqDestination.Options != null) { - URISupport.SetProperties(answer, amqDestination.Options, "consumer."); + StringDictionary options = URISupport.GetProperties(amqDestination.Options, "consumer."); + URISupport.SetProperties(answer, options); } return answer; @@ -689,7 +691,8 @@ namespace Apache.NMS.Stomp Destination amqDestination = destination as Destination; if(amqDestination != null && amqDestination.Options != null) { - URISupport.SetProperties(answer, amqDestination.Options, "producer."); + StringDictionary options = URISupport.GetProperties(amqDestination.Options, "producer."); + URISupport.SetProperties(answer, options); } return answer;