merge v1_5 into default

Author: tonyg

src/com/rabbitmq/client/Connection.java

@@ -75,12 +75,13 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
     ConnectionParameters getParameters();
 
     /**
-     * Get the negotiated maximum number of channels allowed.
+     * Get the negotiated maximum channel number. Usable channel
+     * numbers range from 1 to this number, inclusive.
      *
      * Note that this is the <i>current</i> setting, as opposed to the <i>initially-requested</i>
      * setting available from {@link #getParameters()}.{@link ConnectionParameters#getRequestedChannelMax()}.
      *
-     * @return the maximum number of simultaneously-open channels permitted for this connection.
+     * @return the maximum channel number permitted for this connection.
      */
     int getChannelMax();
 

src/com/rabbitmq/client/ConnectionParameters.java

@@ -54,7 +54,7 @@ private static String safeGetProperty(String key, String def) {
     /** Default virtual host */
     public static final String DEFAULT_VHOST = "/";
 
-    /** Default value for the desired maximum number of channels; zero for
+    /** Default value for the desired maximum channel number; zero for
      * unlimited */
     public static final int DEFAULT_CHANNEL_MAX = 0;
 
@@ -126,8 +126,8 @@ public void setVirtualHost(String virtualHost) {
     }
 
     /**
-     * Retrieve the requested maximum number of channels
-     * @return the initially requested maximum number of channels; zero for unlimited
+     * Retrieve the requested maximum channel number
+     * @return the initially requested maximum channel number; zero for unlimited
      */
     public int getRequestedChannelMax() {
         return _requestedChannelMax;
@@ -166,8 +166,8 @@ public void setRequestedHeartbeat(int requestedHeartbeat) {
     }
 
     /**
-     * Set the requested maximum number of channels
-     * @param requestedChannelMax initially requested maximum number of channels; zero for unlimited
+     * Set the requested maximum channel number
+     * @param requestedChannelMax initially requested maximum channel number; zero for unlimited
      */
     public void setRequestedChannelMax(int requestedChannelMax) {
         _requestedChannelMax = requestedChannelMax;

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -219,7 +219,7 @@ public int getChannelMax() {
     }
 
     /**
-     * Protected API - set the max <b>number</b> of channels available
+     * Protected API - set the max channel <b>number</b>
      */
     public void setChannelMax(int value) {
         _channelManager.setChannelMax(value);

src/com/rabbitmq/client/impl/ChannelManager.java

@@ -47,7 +47,7 @@ public class ChannelManager {
     /** Mapping from channel number to AMQChannel instance */
     private final Map<Integer, ChannelN> _channelMap = Collections.synchronizedMap(new HashMap<Integer, ChannelN>());
 
-    /** Maximum number of channels available on this connection. */
+    /** Maximum channel number available on this connection. */
     public int _channelMax = 0;
 
     public synchronized int getChannelMax() {
@@ -101,7 +101,7 @@ public synchronized int allocateChannelNumber(int maxChannels) {
             maxChannels = Integer.MAX_VALUE;
         }
         int channelNumber = -1;
-        for (int candidate = 1; candidate < maxChannels; candidate++) {
+        for (int candidate = 1; candidate <= maxChannels; candidate++) {
             if (!_channelMap.containsKey(candidate)) {
                 channelNumber = candidate;
                 break;