X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdatarouter.git;a=blobdiff_plain;f=datarouter-node%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fnode%2FTaskList.java;h=1eb73c69161d6438a95506d78b22cd9f923f9115;hp=33e4f801a965377b005ef97b147f066a8e8ba5ca;hb=0a440fd3ae3b413cd7de57677aec690f14ec7d53;hpb=3ebd2534167e73426d2b19efb05eaf9892f6f9d6
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java
index 33e4f801..1eb73c69 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/TaskList.java
@@ -24,41 +24,37 @@
package org.onap.dmaap.datarouter.node;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Iterator;
/**
- * Manage a list of tasks to be executed when an event occurs.
- * This makes the following guarantees:
+ * Manage a list of tasks to be executed when an event occurs. This makes the following guarantees:
*
* - Tasks can be safely added and removed in the middle of a run.
* - No task will be returned more than once during a run.
* - No task will be returned when it is not, at that moment, in the list of tasks.
* - At the moment when next() returns null, all tasks on the list have been returned during the run.
- * - Initially and once next() returns null during a run, next() will continue to return null until startRun() is called.
+ *
- Initially and once next() returns null during a run, next() will continue to return null until startRun() is
+ * called.
*
*/
public class TaskList {
+
private Iterator runlist;
- private HashSet tasks = new HashSet();
+ private HashSet tasks = new HashSet<>();
private HashSet togo;
private HashSet sofar;
private HashSet added;
private HashSet removed;
- /**
- * Construct a new TaskList
- */
- public TaskList() {
- }
-
/**
* Start executing the sequence of tasks.
*/
public synchronized void startRun() {
- sofar = new HashSet();
- added = new HashSet();
- removed = new HashSet();
- togo = new HashSet(tasks);
+ sofar = new HashSet<>();
+ added = new HashSet<>();
+ removed = new HashSet<>();
+ togo = new HashSet<>(tasks);
runlist = togo.iterator();
}
@@ -69,18 +65,13 @@ public class TaskList {
while (runlist != null) {
if (runlist.hasNext()) {
Runnable task = runlist.next();
- if (removed.contains(task)) {
- continue;
+ if (addTaskToSoFar(task)) {
+ return task;
}
- if (sofar.contains(task)) {
- continue;
- }
- sofar.add(task);
- return (task);
}
- if (added.size() != 0) {
+ if (!added.isEmpty()) {
togo = added;
- added = new HashSet();
+ added = new HashSet<>();
removed.clear();
runlist = togo.iterator();
continue;
@@ -115,4 +106,15 @@ public class TaskList {
}
tasks.remove(task);
}
+
+ private boolean addTaskToSoFar(Runnable task) {
+ if (removed.contains(task)) {
+ return false;
+ }
+ if (sofar.contains(task)) {
+ return false;
+ }
+ sofar.add(task);
+ return true;
+ }
}