Simplify grabJob logic

spotify · Aug 21, 2017 · 826aafe · 826aafe
1 parent ffaa9c1
commit 826aafe
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/main/java/com/spotify/futures/ConcurrencyLimiter.java b/src/main/java/com/spotify/futures/ConcurrencyLimiter.java
@@ -120,18 +120,16 @@ public int remainingActiveCapacity() {
    * 2) return null and does not acquire a permit from the semaphore
    */
   private Job<T> grabJob() {
-    while (!queue.isEmpty()) {
-      if (!limit.tryAcquire()) {
-        return null;
-      }
-
-      final Job<T> job = queue.poll();
-      if (job != null) {
-        return job;
-      }
+    if (!limit.tryAcquire()) {
+      return null;
+    }
 
-      limit.release();
+    final Job<T> job = queue.poll();
+    if (job != null) {
+      return job;
     }
+
+    limit.release();
     return null;
   }