If the queue is empty, avoid an extra poll which will do both an extra time conversion and take a lock.

1 files changed, 3 insertions, 3 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
index a18f1b4b260..90c538ac19b 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigSubscription.java
@@ -72,12 +72,12 @@ public class JRTConfigSubscription<T extends ConfigInstance> extends ConfigSubsc
         JRTClientConfigRequest response = pollQueue(timeoutMillis);
         // There might be more than one response on the queue, so empty queue by polling with
         // 0 timeout until queue is empty (returned value is null)
-        JRTClientConfigRequest temp;
-        do {
+        JRTClientConfigRequest temp = response;
+        while (temp != null) {
             temp = pollQueue(0);
             if (temp != null)
                 response = temp;
-        } while (temp != null);
+        }
 
         return response;
     }