Allow for NullPointerException if channel does not exist.

Remove TimeoutBlockingRpcContinuation and add getReply
with timeout to BlockingRpcContinuation instead.
Clarified uninterruptibleGet(int) in BlockingCell.

Author: Hubert Plociniczak

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

@@ -212,7 +212,7 @@ public AMQCommand quiescingRpc(Method m,
                                    final AMQCommand timeoutReply)
         throws IOException, ShutdownSignalException, TimeoutException
     {
-    	TimeoutBlockingRpcContinuation k = new TimeoutBlockingRpcContinuation();
+    	SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();
         transmitAndEnqueue(m, k);
         return k.getReply(timeoutMillisec);
     }
@@ -274,6 +274,12 @@ public T getReply() throws ShutdownSignalException
         {
             return _blocker.uninterruptibleGetValue();
         }
+        
+        public T getReply(int timeout)
+            throws ShutdownSignalException, TimeoutException
+        {
+            return _blocker.uninterruptibleGetValue(timeout);
+        }
 
         public abstract T transformReply(AMQCommand command);
     }
@@ -285,14 +291,4 @@ public AMQCommand transformReply(AMQCommand command) {
             return command;
         }
     }
-    
-    public static class TimeoutBlockingRpcContinuation
-        extends SimpleBlockingRpcContinuation
-    {
-    	public AMQCommand getReply(int timeout)
-    	    throws ShutdownSignalException, TimeoutException
-    	{
-    		return _blocker.uninterruptibleGetValue(timeout);
-    	}
-    }
 }

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

@@ -440,8 +440,8 @@ public MainLoop() {
                                     // channel zero that aren't Connection.CloseOk) must
                                     // be discarded.
                                     ChannelN channel = _channelManager.getChannel(frame.channel);
-                                    if (channel != null)
-                                        channel.handleFrame(frame);
+//                                  FIXME: catch NullPointerException and throw more informative one?
+                                    channel.handleFrame(frame);  
                                 }
                             }
                         }

src/com/rabbitmq/utility/BlockingCell.java

@@ -95,30 +95,32 @@ public synchronized T uninterruptibleGet() {
 
     /**
      * As get(long timeout), but catches and ignores InterruptedException, retrying until
-     * a value appears or until timeout original is reached. If timeout is reached,
+     * a value appears or until specified timeout is reached. If timeout is reached,
      * TimeoutException it thrown.
      * We also use System.nanoTime() to behave correctly when system clock jumps around.
      *  
-     * @param timeout timeout in miliseconds. Value less than zero effectively means infinity
+     * @param timeout timeout in miliseconds. 0 effectively means infinity
      * @return the waited-for value
      */
     public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
-        long runTime = System.nanoTime() / NANOS_IN_MILLI + timeout;
-        long now = 0;
+        long now = System.nanoTime() / NANOS_IN_MILLI;
+        long runTime = now + timeout;
+
 
         if (timeout < 0) {
         	throw new AssertionError("Timeout cannot be less than zero");
         }
-
-        while ((timeout == 0) || ((now = System.nanoTime() / NANOS_IN_MILLI) < runTime)) {
-            try {
+        
+        do {
+        	try {
                 synchronized(this) {
-                    return get(timeout != 0 ? (runTime - now) : 0);
+                    return get(runTime - now);
                 }
             } catch (InterruptedException e) {
                 // Ignore.
             }
-        }
+        } while ((timeout == 0) || ((now = System.nanoTime() / NANOS_IN_MILLI) < runTime));
+        
         throw new TimeoutException();
     }