complete failure in the implementation of IntAllocator.flush() lead to being unable to create a channel with a previously explicitly^Csed number that had since been closed

Author: David R. MacIver

src/com/rabbitmq/utility/IntAllocator.java

@@ -132,10 +132,10 @@ public boolean reserve(int id){
     return false;
   }
 
-  private void flush(){
+  public void flush(){
     if(unsortedCount == 0) return;
 
-    Arrays.sort(unsorted);
+    Arrays.sort(unsorted, 0, unsortedCount);
 
     ListIterator<Interval> it = intervals.listIterator();
 
@@ -145,7 +145,7 @@ private void flush(){
       while((i < unsortedCount - 1) && (unsorted[i + 1] == unsorted[i] + 1))
         i++;
 
-      Interval interval = new Interval(start, i);
+      Interval interval = new Interval(unsorted[start], unsorted[i]);
 
       // Scan to an appropriate point in the list to insert this interval
       // this may well be the end

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

@@ -74,4 +74,9 @@ public void testManualAllocationDoesntBreakThings() throws Exception{
     Channel ch = connection.createChannel();
     assertNotNull(ch);
   }
+
+  public void testReuseManuallyAllocatedChannelNumber() throws Exception{
+    connection.createChannel(1).close();
+    assertNotNull(connection.createChannel(1));
+  }
 }