third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE when instanceTimeLimit is null

Browse Source
This commit is contained in:
tjq 2021-03-06 19:11:29 +08:00
parent 5b09865b42
commit f633f9ae57
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/remote/DispatchService.java
View File

@ -180,7 +180,9 @@ public class DispatchService {
req.setProcessorType(ProcessorType.of(jobInfo.getProcessorType()).name());
req.setTimeExpressionType(TimeExpressionType.of(jobInfo.getTimeExpressionType()).name());
req.setInstanceTimeoutMS(jobInfo.getInstanceTimeLimit());
if (jobInfo.getInstanceTimeLimit() != null) {
req.setInstanceTimeoutMS(jobInfo.getInstanceTimeLimit());
}
req.setThreadConcurrency(jobInfo.getConcurrency());
return req;
}

2
powerjob-server/src/main/resources/application-daily.properties
View File

@ -3,7 +3,7 @@ logging.config=classpath:logback-dev.xml
####### Database properties(Configure according to the the environment) #######
spring.datasource.core.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3307/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.core.jdbc-url=jdbc:mysql://localhost:3306/powerjob-daily?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
spring.datasource.core.username=root
spring.datasource.core.password=No1Bug2Please3!
spring.datasource.core.hikari.maximum-pool-size=20