fix NPE for failover & monitorExecuton

RoyZeng · Apr 7, 2017 · 765259a · 765259a
1 parent 18bd679
commit 765259a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...e-core/src/main/java/com/dangdang/ddframe/job/lite/internal/failover/FailoverService.java b/...e-core/src/main/java/com/dangdang/ddframe/job/lite/internal/failover/FailoverService.java
@@ -18,6 +18,7 @@
 package com.dangdang.ddframe.job.lite.internal.failover;
 
 import com.dangdang.ddframe.job.lite.internal.schedule.JobRegistry;
+import com.dangdang.ddframe.job.lite.internal.schedule.JobScheduleController;
 import com.dangdang.ddframe.job.lite.internal.sharding.ShardingNode;
 import com.dangdang.ddframe.job.lite.internal.sharding.ShardingService;
 import com.dangdang.ddframe.job.lite.internal.storage.JobNodeStorage;
@@ -150,7 +151,10 @@ public void execute() {
  jobNodeStorage.fillEphemeralJobNode(FailoverNode.getExecutionFailoverNode(crashedItem), JobRegistry.getInstance().getJobInstance(jobName).getIp());
  jobNodeStorage.removeJobNodeIfExisted(FailoverNode.getItemsNode(crashedItem));
  // TODO 不应使用triggerJob, 而是使用executor统一调度
- JobRegistry.getInstance().getJobScheduleController(jobName).triggerJob();
+ JobScheduleController jobScheduleController = JobRegistry.getInstance().getJobScheduleController(jobName);
+ if (null != jobScheduleController) {
+ jobScheduleController.triggerJob();
+ }
  }
  }
 }
diff --git a/...-core/src/main/java/com/dangdang/ddframe/job/lite/internal/sharding/ExecutionService.java b/...-core/src/main/java/com/dangdang/ddframe/job/lite/internal/sharding/ExecutionService.java
@@ -18,6 +18,7 @@
 package com.dangdang.ddframe.job.lite.internal.sharding;
 
 import com.dangdang.ddframe.job.executor.ShardingContexts;
+import com.dangdang.ddframe.job.lite.config.LiteJobConfiguration;
 import com.dangdang.ddframe.job.lite.internal.config.ConfigurationService;
 import com.dangdang.ddframe.job.lite.internal.election.LeaderService;
 import com.dangdang.ddframe.job.lite.internal.schedule.JobRegistry;
@@ -126,7 +127,8 @@ public void clearRunningInfo(final List<Integer> items) {
  * @return 分片项中是否还有执行中的作业
  */
  public boolean hasRunningItems(final Collection<Integer> items) {
- if (!configService.load(true).isMonitorExecution()) {
+ LiteJobConfiguration jobConfig = configService.load(true);
+ if (null == jobConfig || !jobConfig.isMonitorExecution()) {
  return false;
  }
  for (int each : items) {