merging bug22965 into default

Author: Vlad Alexandru Ionescu

src/com/rabbitmq/utility/BlockingCell.java

@@ -76,13 +76,17 @@ public synchronized T get() throws InterruptedException {
      * @throws InterruptedException if this thread is interrupted
      */
     public synchronized T get(long timeout) throws InterruptedException, TimeoutException {
-        if (timeout < 0 && timeout != INFINITY)
+        if (timeout == INFINITY) return get();
+
+        if (timeout < 0)
             throw new AssertionError("Timeout cannot be less than zero");
-        
-        if (!_filled && timeout != 0) {
-            wait(timeout == INFINITY ? 0 : timeout);
+
+        long maxTime = System.currentTimeMillis() + timeout;
+        long now;
+        while (!_filled && (now = System.currentTimeMillis()) < maxTime) {
+            wait(maxTime - now);
         }
-        
+
         if (!_filled)
             throw new TimeoutException();