You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/07/20 23:42:43 UTC

svn commit: r966023 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp: Connection.cs MessageConsumer.cs Session.cs

Author: tabish
Date: Tue Jul 20 21:42:42 2010
New Revision: 966023

URL: http://svn.apache.org/viewvc?rev=966023&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.ActiveMQ/trunk/src/main/csharp/Connection.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs?rev=966023&r1=966022&r2=966023&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Connection.cs Tue Jul 20 21:42:42 2010
@@ -407,7 +407,8 @@ namespace Apache.NMS.ActiveMQ
 
             // Set propertieDs 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.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs?rev=966023&r1=966022&r2=966023&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/MessageConsumer.cs Tue Jul 20 21:42:42 2010
@@ -18,6 +18,7 @@ using System;
 using System.Threading;
 using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using Apache.NMS.ActiveMQ.Commands;
 using Apache.NMS;
 using Apache.NMS.Util;
@@ -96,8 +97,9 @@ namespace Apache.NMS.ActiveMQ
             // If the destination contained a URI query, then use it to set public properties
             // on the ConsumerInfo
             if(destination.Options != null)
-            {
-                URISupport.SetProperties(this.info, destination.Options, "consumer.");
+            {				
+				StringDictionary options = URISupport.GetProperties(destination.Options, "consumer.");
+				URISupport.SetProperties(this.info, options);
             }
 		}
 

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs?rev=966023&r1=966022&r2=966023&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Session.cs Tue Jul 20 21:42:42 2010
@@ -44,7 +44,7 @@ namespace Apache.NMS.ActiveMQ
         private bool dispatchAsync;
         private bool exclusive;
         private bool retroactive;
-        private byte priority = 4;
+        private byte priority = 0;
 
         private readonly SessionInfo info;
         private int consumerCounter;
@@ -421,7 +421,7 @@ namespace Apache.NMS.ActiveMQ
                 consumer = new MessageConsumer(this, GetNextConsumerId(), dest, null, selector, prefetchSize,
                                                this.connection.PrefetchPolicy.MaximumPendingMessageLimit,
                                                noLocal, false, this.connection.DispatchAsync);
-
+				
                 this.AddConsumer(consumer);
                 this.Connection.SyncRequest(consumer.ConsumerInfo);