openChannel seems to work fine now, and there's no reason the previous code shoudl be expected to work except that it happened to use to

Author: David R. MacIver

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

@@ -77,6 +77,15 @@ public void testManualAllocationDoesntBreakThings() throws Exception{
 
   public void testReuseManuallyAllocatedChannelNumber() throws Exception{
     connection.createChannel(1).close();
-    assertNotNull(connection.createChannel(1));
+    Channel ch = connection.createChannel(1);
+    assertNotNull(ch);
+    ch.close();
+
+    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();
+    }
   }
 }

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

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