we need to make the previously trailing interval the leading one if we throw away the old leading interval, otherwise the last interval will end up getting discarded

Author: David R. MacIver

src/com/rabbitmq/utility/IntAllocator.java

@@ -177,6 +177,7 @@ private void normalize(){
       if(leading.start == trailing.end + 1) {
         it.remove(); 
         trailing.end = leading.end;
+        leading = trailing;
       }
     } 
   }

test/src/com/rabbitmq/client/test/ChannelNumberAllocationTests.java

@@ -75,17 +75,21 @@ public void testManualAllocationDoesntBreakThings() throws Exception{
     assertNotNull(ch);
   }
 
-  public void testReuseManuallyAllocatedChannelNumber() throws Exception{
+  public void testReuseManuallyAllocatedChannelNumber1() throws Exception{
     connection.createChannel(1).close();
-    Channel ch = connection.createChannel(1);
-    assertNotNull(ch);
-    ch.close();
+    assertNotNull(connection.createChannel(1));
+  }
 
-    for(int repeat = 0; repeat < 3; repeat++){
-      Channel[] channels = new Channel[8];
-      for(int i = 1; i <= channels.length; i++)
-        assertNotNull(channels[i-1] = connection.createChannel(i));
-      for(Channel ch2 : channels) ch2.close();
-    }
+  public void testReuseManuallyAllocatedChannelNumber2() throws Exception{
+    connection.createChannel(2).close();
+    assertNotNull(connection.createChannel(3));
+  }
+
+  public void testReserveOnBoundaries() throws Exception{
+    assertNotNull(connection.createChannel(3));
+    assertNotNull(connection.createChannel(4));
+    assertNotNull(connection.createChannel(2));
+    assertNotNull(connection.createChannel(5));
+    assertNotNull(connection.createChannel(1));
   }
 }

test/src/com/rabbitmq/client/test/server/Permissions.java

@@ -285,7 +285,9 @@ protected void runTest(boolean exp, String name, WithName test)
             assertEquals(msg,
                          AMQP.ACCESS_REFUSED,
                          ((AMQP.Channel.Close)m).getReplyCode());
-            openChannel();
+            //This fails due to bug 20296
+            //openChannel();
+            channel = connection.createChannel(channel.getChannelNumber() + 1);
         }
     }