fix NPE for buildTask

RoyZeng · Apr 7, 2017 · 7039915 · 7039915
1 parent beda30f
commit 7039915
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...rc/main/java/com/dangdang/ddframe/job/lite/internal/sharding/ExecutionContextService.java b/...rc/main/java/com/dangdang/ddframe/job/lite/internal/sharding/ExecutionContextService.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.api.strategy.JobInstance;
 import com.dangdang.ddframe.job.lite.config.LiteJobConfiguration;
 import com.dangdang.ddframe.job.lite.internal.config.ConfigurationService;
 import com.dangdang.ddframe.job.lite.internal.schedule.JobRegistry;
@@ -70,8 +71,9 @@ public ShardingContexts getJobShardingContext(final List<Integer> shardingItems)
  }
 
  private String buildTaskId(final LiteJobConfiguration liteJobConfig, final List<Integer> shardingItems) {
- String jobInstanceId = JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId();
- return Joiner.on("@-@").join(liteJobConfig.getJobName(), Joiner.on(",").join(shardingItems), "READY", null == jobInstanceId ? "127.0.0.1@-@1" : jobInstanceId); 
+ JobInstance jobInstance = JobRegistry.getInstance().getJobInstance(jobName);
+ return Joiner.on("@-@").join(liteJobConfig.getJobName(), Joiner.on(",").join(shardingItems), "READY", 
+ null == jobInstance.getJobInstanceId() ? "127.0.0.1@-@1" : jobInstance.getJobInstanceId()); 
  }
 
  private void removeRunningIfMonitorExecution(final boolean monitorExecution, final List<Integer> shardingItems) {