Use Args instead

Author: arturobernalg

httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/SharedRequestExecutionQueue.java

@@ -27,13 +27,13 @@
 
 package org.apache.hc.client5.http.impl.async;
 
-import java.util.Objects;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.hc.core5.annotation.Internal;
 import org.apache.hc.core5.concurrent.Cancellable;
+import org.apache.hc.core5.util.Args;
 
 /**
  * Shared FIFO execution queue with a hard cap on concurrently executing tasks.
@@ -58,8 +58,8 @@ final class SharedRequestExecutionQueue {
     }
 
     Cancellable enqueue(final Runnable task, final Runnable onCancel) {
-        Objects.requireNonNull(task, "task");
-        Objects.requireNonNull(onCancel, "onCancel");
+        Args.notNull(task, "task");
+        Args.notNull(onCancel, "onCancel");
 
         final Entry entry = new Entry(task, onCancel);
         queue.add(entry);
@@ -81,7 +81,7 @@ private void drain() {
                 while (inFlight.get() < maxConcurrent) {
                     final Entry entry = queue.poll();
                     if (entry == null) {
-                        return;
+                        break;
                     }
                     if (entry.isCancelled()) {
                         continue;
@@ -99,6 +99,7 @@ private void drain() {
         }
     }
 
+
     private static final class Entry implements Cancellable {
 
         private final Runnable task;