From cec5e8831933d603d207fbbcb93cb51914a6d8bc Mon Sep 17 00:00:00 2001 From: caishunfeng Date: Thu, 28 Jul 2022 09:43:58 +0800 Subject: [PATCH] [Bug-11071] Fix task local params NPE (#11166) * fix local param NPE * delete empty files --- .../server/master/processor/TaskRecallProcessor.java | 0 .../plugin/task/api/parameters/AbstractParameters.java | 2 +- .../dolphinscheduler/server/worker/cache/ResponseCache.java | 0 .../server/worker/processor/TaskCallbackService.java | 0 .../server/worker/processor/TaskRejectAckProcessor.java | 0 .../server/worker/runner/RetryReportTaskStatusThread.java | 0 6 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskRecallProcessor.java delete mode 100644 dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/cache/ResponseCache.java delete mode 100644 dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java delete mode 100644 dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java delete mode 100644 dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskRecallProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/processor/TaskRecallProcessor.java deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java index 4a7f1c83ca..4b2e8c858a 100644 --- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java +++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/AbstractParameters.java @@ -93,7 +93,7 @@ public abstract class AbstractParameters implements IParameters { if (localParams != null) { for (Property property : localParams) { - if (property.getDirect().equals(Direct.IN)) { + if (property.getDirect() == null || property.getDirect().equals(Direct.IN)) { localParametersMaps.put(property.getProp(), property); } } diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/cache/ResponseCache.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/cache/ResponseCache.java deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskCallbackService.java deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/processor/TaskRejectAckProcessor.java deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java b/dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java deleted file mode 100644 index e69de29bb2..0000000000