Refine message wait logic in MessageConsumerImpl

Improved the wait mechanism to ensure accurate handling of timeout conditions when waiting for messages. Reworked the loop structure to simplify checks and utilize precise nanosecond-based deadlines for better reliability.

Author: iitsoftware

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

@@ -130,6 +130,7 @@ void addToCache(AsyncMessageDeliveryRequest request) {
         if (request.isRequiresRestart())
             fillCachePending.set(false);
         messageCache.add(request);
+        waiter.signal();
     }
 
     void addToCache(AsyncMessageDeliveryRequest[] requests, boolean lastRestartRequired) {
@@ -372,12 +373,14 @@ 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));
                                 }
                             }