Merged 21333 into default

dpw · dpw · commit 7f15ea32a5b4 · 2009-08-07T13:11:35.000+01:00
diff --git a/src/com/rabbitmq/client/impl/ChannelManager.java b/src/com/rabbitmq/client/impl/ChannelManager.java
@@ -98,7 +98,8 @@ public synchronized ChannelN createChannel(AMQConnection connection, int channel
 
     public synchronized int allocateChannelNumber(int maxChannels) {
         if (maxChannels == 0) {
-            maxChannels = Integer.MAX_VALUE;
+            // The framing encoding only allows for unsigned 16-bit integers for the channel number
+            maxChannels = (1 << 16) - 1;
         }
         int channelNumber = -1;
         for (int candidate = 1; candidate <= maxChannels; candidate++) {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,8 @@ public synchronized ChannelN createChannel(AMQConnection connection, int channel`
`98`	`98`
`99`	`99`	`public synchronized int allocateChannelNumber(int maxChannels) {`
`100`	`100`	`if (maxChannels == 0) {`
`101`		`- maxChannels = Integer.MAX_VALUE;`
	`101`	`+ // The framing encoding only allows for unsigned 16-bit integers for the channel number`
	`102`	`+ maxChannels = (1 << 16) - 1;`
`102`	`103`	`}`
`103`	`104`	`int channelNumber = -1;`
`104`	`105`	`for (int candidate = 1; candidate <= maxChannels; candidate++) {`