Revert "Refine message wait logic in MessageConsumerImpl"

This reverts commit c810f9e.

Author: iitsoftware

src/main/java/com/swiftmq/jms/v750/MessageConsumerImpl.java

@@ -130,7 +130,6 @@ void addToCache(AsyncMessageDeliveryRequest request) {
         if (request.isRequiresRestart())
             fillCachePending.set(false);
         messageCache.add(request);
-        waiter.signal();
     }
 
     void addToCache(AsyncMessageDeliveryRequest[] requests, boolean lastRestartRequired) {
@@ -373,14 +372,12 @@ Message receiveMessage(boolean block, long timeout) throws JMSException {
                             } else {
                                 long deadline = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(timeout);
                                 long remaining;
-                                while (true) {
-                                    if (messageCache.getSize() > 0 || !fillCachePending.get() || cancelled.get() || isClosed())
-                                        break;
-
-                                    remaining = deadline - System.nanoTime();
-                                    if (remaining <= 0)
-                                        break;
 
+                                while ((remaining = deadline - System.nanoTime()) > 0 &&
+                                       messageCache.getSize() == 0 &&
+                                       fillCachePending.get() &&
+                                       !cancelled.get() &&
+                                       !isClosed()) {
                                     waiter.doWait(TimeUnit.NANOSECONDS.toMillis(remaining));
                                 }
                             }