Removed old IntAllocator -- replaced with IntBitSetAllocator.

Author: Steve Powell

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

@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import com.rabbitmq.client.ShutdownSignalException;
-import com.rabbitmq.utility.IntAllocator;
+import com.rabbitmq.utility.IntBitSetAllocator;
 
 /**
  * Manages a set of channels, indexed by channel number.
@@ -34,7 +34,7 @@ public class ChannelManager {
     /** Mapping from channel number to AMQChannel instance */
     private final Map<Integer, ChannelN> _channelMap =
         Collections.synchronizedMap(new HashMap<Integer, ChannelN>());
-    private final IntAllocator channelNumberAllocator;
+    private final IntBitSetAllocator channelNumberAllocator;
 
     /** Maximum channel number available on this connection. */
     public final int _channelMax;
@@ -50,7 +50,7 @@ public ChannelManager(int channelMax) {
             channelMax = (1 << 16) - 1;
         }
         _channelMax = channelMax;
-        channelNumberAllocator = new IntAllocator(1, channelMax);
+        channelNumberAllocator = new IntBitSetAllocator(1, channelMax);
     }
 
 

src/com/rabbitmq/utility/IntAllocator.java

@@ -69,13 +69,15 @@ public void testAllocateAfterFreeingMany() throws Exception{
     for(int i = 1; i <= CHANNEL_COUNT; i++)
       channels.add(connection.createChannel());
 
-    // In the current implementation the list should actually
-    // already be sorted, but we don't want to force that behaviour
+    // In the current implementation the allocated numbers need not be increasing
     Collections.sort(channels, COMPARATOR);
 
-    int i = 1;
-    for(Channel channel : channels)
-      assertEquals(i++, channel.getChannelNumber());
+    assertEquals("Didn't create the right number of channels!", CHANNEL_COUNT, channels.size());
+    for(int i = 1; i < CHANNEL_COUNT; ++i) {
+        assertTrue("Channel numbers should be distinct."
+                  , channels.get(i-1).getChannelNumber() < channels.get(i).getChannelNumber()
+                  );
+    }
   }
 
   public void testAllocateAfterManualAssign() throws Exception{