GC unused import and code.

2 files changed, 8 insertions, 19 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
index 07efd419c97..ec74fb9246d 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -31,7 +31,13 @@ import com.yahoo.processing.execution.chain.ChainRegistry;
 import com.yahoo.statistics.Statistics;
 
 import java.util.TimerTask;
-import java.util.concurrent.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
@@ -203,8 +209,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
         return null;
     }
 
-    @SuppressWarnings("unchecked")
-    void submit(DocumentProcessingTask task) {
+    private void submit(DocumentProcessingTask task) {
         if (threadPool.isAboveLimit()) {
             task.queueFull();
         } else {
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
index 0bc95fe6c7b..ca4648678a5 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
@@ -17,8 +17,6 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -34,7 +32,6 @@ public class DocumentProcessingTask implements Comparable<DocumentProcessingTask
 
     private final DocumentProcessingHandler docprocHandler;
     private RequestContext requestContext;
-    private int waitCounter;
 
     private final static AtomicLong seq = new AtomicLong();
     private final long seqNum;
@@ -45,7 +42,6 @@ public class DocumentProcessingTask implements Comparable<DocumentProcessingTask
         seqNum = seq.getAndIncrement();
         this.requestContext = requestContext;
         this.docprocHandler = docprocHandler;
-        this.waitCounter = 10;
         this.service = service;
     }
 
@@ -80,18 +76,6 @@ public class DocumentProcessingTask implements Comparable<DocumentProcessingTask
     }
 
     /**
-     * Used by DocprocThreadManager. If a ProcessingTask has been taken by a thread, it can wait() no longer than
-     * waitCounter (currently 10) times before being executed. This is to prevent large tasks from being delayed
-     * forever.
-     *
-     * @return true if this task can wait, false if it must run NOW.
-     */
-    boolean doWait() {
-        --waitCounter;
-        return (waitCounter > 0);
-    }
-
-    /**
      * Processes a single Processing, and fails the message if this processing fails.
      *
      * @param executor the DocprocService to use for processing