Modify WorkPool so as not to complain so loudly if the channel is not in the pool.

Modify WorkPoolTests to check this correctly.
Small JavaDoc updates in the area.

Author: Steve Powell

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

@@ -8,7 +8,7 @@
 /** A generic queue-like implementation (supporting operations <code>addIfNotPresent</code>,
  * <code>poll</code>, <code>contains</code>, and <code>isEmpty</code>)
  * which restricts a queue element to appear at most once.
- * If the element is already present {@link #addIfNotPresent(T)} returns <code><b>false</b></code>.
+ * If the element is already present {@link #addIfNotPresent} returns <code><b>false</b></code>.
  * <p/>
  * Elements must not be <code><b>null</b></code>.
  * <p/><b>Concurrent Semantics</b><br/>
@@ -43,7 +43,8 @@ public T poll() {
         return item;
     }
 
-    /** @return <code><b>true</b></code> if and only if <b>item</b> is in the queue.*/
+    /** @param item to look for in queue
+     * @return <code><b>true</b></code> if and only if <b>item</b> is in the queue.*/
     public boolean contains(T item) {
         return this.members.contains(item);
     }
@@ -54,6 +55,7 @@ public boolean isEmpty() {
     }
 
     /** Remove item from queue, if present.
+     * @param item to remove
      *  @return <code><b>true</b></code> if and only if item was initially present and was removed.
      */
     public boolean remove(T item) {

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

@@ -63,12 +63,14 @@
  * </pre>
  * <i>dormant</i> is not represented in the implementation state, and adding items
  * when the client is <i>in progress</i> or <i>ready</i> does not change its state.
+ * @param <K> Key -- type of client
+ * @param <W> Work -- type of work item
  */
 public class WorkPool<K, W> {
 
     /** protecting <code>ready</code>, <code>inProgress</code> and <code>pool</code> */
     private final Object monitor = new Object();
-        /** An ordered queue of <i>ready</i> clients. */
+        /** An injective queue of <i>ready</i> clients. */
         private final SetQueue<K> ready = new SetQueue<K>();
         /** The set of clients which have work <i>in progress</i>. */
         private final Set<K> inProgress = new HashSet<K>();
@@ -79,7 +81,7 @@ public class WorkPool<K, W> {
      * Add client <code><b>key</b></code> to pool of item queues, with an empty queue.
      * A client is initially <i>dormant</i>.
      * <p/>
-     * No-op if <code><b>key</b></code> already present. 
+     * No-op if <code><b>key</b></code> already present.
      * @param key client to add to pool
      */
     public void registerKey(K key) {
@@ -162,18 +164,16 @@ private static <W> int drainTo(LinkedList<W> deList, Collection<W> c, int maxEle
      * @param item the work item to add to the client queue
      * @return <code><b>true</b></code> if and only if the client is marked <i>ready</i>
      * &mdash; <i>as a result of this work item</i>
-     * @throws IllegalArgumentException if key not registered.
      */
     public boolean addWorkItem(K key, W item) {
         synchronized (this.monitor) {
             Queue<W> queue = this.pool.get(key);
-            if (queue == null) {
-                throw new IllegalArgumentException("Client " + key + " not registered");
-            }
-            queue.offer(item);
-            if (isDormant(key)) {
-                dormantToReady(key);
-                return true;
+            if (queue != null) {
+                queue.offer(item);
+                if (isDormant(key)) {
+                    dormantToReady(key);
+                    return true;
+                }
             }
             return false;
         }
@@ -208,7 +208,7 @@ private boolean moreWorkItems(K key) {
         LinkedList<W> leList = this.pool.get(key);
         return (leList==null ? false : !leList.isEmpty());
     }
-    
+
     /* State identification functions */
     private boolean isInProgress(K key){ return this.inProgress.contains(key); }
     private boolean isReady(K key){ return this.ready.contains(key); }

test/src/com/rabbitmq/client/test/functional/RequeueOnClose.java

@@ -14,7 +14,6 @@
 //  Copyright (c) 2007-2012 VMware, Inc.  All rights reserved.
 //
 
-
 package com.rabbitmq.client.test.functional;
 
 import com.rabbitmq.client.test.BrokerTestCase;
@@ -27,9 +26,9 @@
 public abstract class RequeueOnClose
     extends BrokerTestCase
 {
-    public static final String Q = "RequeueOnClose";
-    public static final int GRATUITOUS_DELAY = 100;
-    public static final int MESSAGE_COUNT = 2000;
+    private static final String Q = "RequeueOnClose";
+    private static final int GRATUITOUS_DELAY = 100;
+    private static final int MESSAGE_COUNT = 2000;
 
     protected abstract void open() throws IOException;
 

test/src/com/rabbitmq/client/test/impl/WorkPoolTests.java

@@ -12,13 +12,8 @@ public class WorkPoolTests extends TestCase {
 
     private WorkPool<String, Object> pool = new WorkPool<String, Object>();
 
-    public void testUnkownKey() {
-        try {
-            this.pool.addWorkItem("test", new Object());
-            fail("Expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
+    public void testUnknownKey() {
+        assertFalse(this.pool.addWorkItem("test", new Object()));
     }
 
     public void testBasicInOut() throws InterruptedException {