From 7c82d33601ba7c5e1cf5eec3f6b223c1602f3501 Mon Sep 17 00:00:00 2001 From: lucyguan Date: Thu, 1 Feb 2024 09:15:23 +0800 Subject: [PATCH 1/2] timeoutFlag NullPointerException --- .../dolphinscheduler/tools/datasource/dao/JsonSplitDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java index 2a411df994..a9e8f06974 100644 --- a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java +++ b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java @@ -191,7 +191,7 @@ public class JsonSplitDao { insert.setLong(12, taskDefinitionLog.getEnvironmentCode()); insert.setInt(13, taskDefinitionLog.getFailRetryTimes()); insert.setInt(14, taskDefinitionLog.getFailRetryInterval()); - insert.setInt(15, taskDefinitionLog.getTimeoutFlag().getCode()); + insert.setInt(15, taskDefinitionLog.getTimeoutFlag() == null ? TimeoutFlag.CLOSE.getCode() : taskDefinitionLog.getTimeoutFlag().getCode()); insert.setInt(16, taskDefinitionLog.getTimeoutNotifyStrategy() == null ? 0 : taskDefinitionLog.getTimeoutNotifyStrategy().getCode()); insert.setInt(17, taskDefinitionLog.getTimeout()); From 8d40809a3be4c8c7b51dcc11c876b8c860a6ea90 Mon Sep 17 00:00:00 2001 From: lucyguan Date: Thu, 1 Feb 2024 09:18:27 +0800 Subject: [PATCH 2/2] fixbug --- .../dolphinscheduler/tools/datasource/dao/JsonSplitDao.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java index a9e8f06974..c7893764ea 100644 --- a/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java +++ b/dolphinscheduler-tools/src/main/java/org/apache/dolphinscheduler/tools/datasource/dao/JsonSplitDao.java @@ -17,6 +17,7 @@ package org.apache.dolphinscheduler.tools.datasource.dao; +import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog; import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog; import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;