Fix for OODT-951: Wrong null checker contributed by JC.
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/3af750a5 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/3af750a5 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/3af750a5 Branch: refs/heads/development Commit: 3af750a5c7c86f49ef1347d27cea089fe8a23d42 Parents: 9e5d75d Author: Chris Mattmann <[email protected]> Authored: Sun Feb 25 18:28:45 2018 -0800 Committer: Chris Mattmann <[email protected]> Committed: Sun Feb 25 18:28:45 2018 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/3af750a5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5323db1..88ed8d1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,8 @@ Apache OODT Change Log ======= Release 1.9 - In Progress +* OODT-951 Wrong null checker (JC via mattmann) + * OODT-972 Add filemgr.server and filemgr.client configuration keys to Radix filemgr.properties (lewismc via mattmann) * OODT-964, OODT-963 Fix issues merging Distributed ZK Config module into Avro-RPC branch (imesha,mattmann) http://git-wip-us.apache.org/repos/asf/oodt/blob/3af750a5/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java index 315f3b9..6a1ef7f 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/engine/PrioritizedQueueBasedWorkflowEngine.java @@ -70,7 +70,7 @@ public class PrioritizedQueueBasedWorkflowEngine implements WorkflowEngine { PrioritySorter prioritizer, WorkflowLifecycleManager lifecycle, EngineRunner runner, WorkflowRepository modelRepo, long querierWaitSeconds) { this.repo = repo; - this.prioritizer = prioritizer != null ? new HighestFIFOPrioritySorter(1, + this.prioritizer = prioritizer == null ? new HighestFIFOPrioritySorter(1, 50, 1) : prioritizer; this.lifecycle = lifecycle; this.modelRepo = modelRepo;
