Merge with upstream

Author: essiene

src/client/api/ConnectionParameters.cs

@@ -71,8 +71,8 @@ public class ConnectionParameters : ICloneable
         /// <summary>Default virtual host (value: "/")</summary>
         public const string DefaultVHost = "/"; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
 
-        /// <summary> Default value for the desired maximum number of
-        /// channels, with zero meaning unlimited (value: 0)</summary>
+        /// <summary> Default value for the desired maximum channel
+        /// number, with zero meaning unlimited (value: 0)</summary>
         public const ushort DefaultChannelMax = 0; // PLEASE KEEP THIS MATCHING THE DOC ABOVE
 
         /// <summary>Default value for the desired maximum frame size,
@@ -116,7 +116,7 @@ public string VirtualHost
             set { m_virtualHost = value; }
         }
 
-        /// <summary>Channel-max parameter to ask for (number of channels)</summary>
+        /// <summary>Maximum channel number to ask for</summary>
         public ushort RequestedChannelMax
         {
             get { return m_requestedChannelMax; }

src/client/api/IConnection.cs

@@ -107,8 +107,9 @@ public interface IConnection: IDisposable
         ///of this connection.</summary>
         ConnectionParameters Parameters { get; }
 
-        ///<summary>The maximum number of channels this connection
-        ///supports (0 if unlimited).</summary>
+        ///<summary>The maximum channel number this connection
+        ///supports (0 if unlimited). Usable channel numbers
+        ///range from 1 to this number, inclusive.</summary>
         ushort ChannelMax { get; }
 
         ///<summary>The maximum frame size this connection supports (0

src/client/impl/SessionManager.cs

@@ -84,26 +84,7 @@ public ushort ChannelMax
             }
             set
             {
-                if ((value < 2) && (value != 0))
-                {
-                    // We currently interpret channel max as
-                    // *including* channel zero. We also think it
-                    // doesn't make sense to forbid opening of any
-                    // real usable channels, so by our ch0-including
-                    // assumption, the minimum *useful* value for
-                    // channel max is 2.
-                    //
-                    // This code is here to work around OpenAMQ
-                    // 1.2c4's channel max setting of 1.
-                    //
-                    // FIXME: warning? or is there something more
-                    // sensible we can do here?
-                    m_channelMax = 2;
-                }
-                else
-                {
-                    m_channelMax = value;
-                }
+                m_channelMax = value;
             }
         }
 
@@ -192,7 +173,7 @@ public ISession Swap(int channelNumber, ISession replacement) {
         public int Allocate()
         {
             ushort maxChannels = (m_channelMax == 0) ? ushort.MaxValue : m_channelMax;
-            for (int candidate = 1; candidate < maxChannels; candidate++)
+            for (int candidate = 1; candidate <= maxChannels; candidate++)
             {
                 if (!m_sessionMap.ContainsKey(candidate))
                 {