From e97bdc71c7d661f1f2332189564daeb58a233a58 Mon Sep 17 00:00:00 2001 From: tjq Date: Sat, 6 Feb 2021 15:37:12 +0800 Subject: [PATCH] fix: NPE when InstanceTimeLimit is null #207 --- .../com/github/kfcfans/powerjob/server/service/JobService.java | 3 +++ .../powerjob/samples/processors/BroadcastProcessorDemo.java | 1 - .../powerjob/samples/processors/MapReduceProcessorDemo.java | 3 +-- .../powerjob/samples/processors/StandaloneProcessorDemo.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java index 8525846e..290f87fc 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/JobService.java @@ -233,6 +233,9 @@ public class JobService { if (jobInfoDO.getTaskRetryNum() == null) { jobInfoDO.setTaskRetryNum(0); } + if (jobInfoDO.getInstanceTimeLimit() == null) { + jobInfoDO.setInstanceTimeLimit(0L); + } } private static JobInfoDTO convert(JobInfoDO jobInfoDO) { diff --git a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java index 70dc3759..84d69650 100644 --- a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/BroadcastProcessorDemo.java @@ -13,7 +13,6 @@ import java.util.List; /** * 广播处理器 示例 - * com.github.kfcfans.oms.server.processors.BroadcastProcessorDemo * * @author tjq * @since 2020/4/17 diff --git a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java index fc6e7a68..9c0477ab 100644 --- a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/MapReduceProcessorDemo.java @@ -21,8 +21,7 @@ import java.util.concurrent.ThreadLocalRandom; /** * MapReduce 处理器示例 - * com.github.kfcfans.oms.server.processors.MapReduceProcessorDemo - * {"batchSize": 100, "batchNum": 2} + * 控制台参数：{"batchSize": 100, "batchNum": 2} * * @author tjq * @since 2020/4/17 diff --git a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java index 66f606c9..24c30024 100644 --- a/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java +++ b/powerjob-worker-samples/src/main/java/com/github/kfcfans/powerjob/samples/processors/StandaloneProcessorDemo.java @@ -11,7 +11,7 @@ import java.util.Collections; /** * 单机处理器 示例 - * com.github.kfcfans.oms.server.processors.StandaloneProcessorDemo + * com.github.kfcfans.powerjob.samples.processors.StandaloneProcessorDemo * * @author tjq * @since 2020/4/17