fix NPE for buildTaskId

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

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...e/elastic-job-lite-core/src/main/java/com/dangdang/ddframe/job/lite/api/JobScheduler.java b/...e/elastic-job-lite-core/src/main/java/com/dangdang/ddframe/job/lite/api/JobScheduler.java
@@ -104,9 +104,9 @@ private void setGuaranteeServiceForElasticJobListeners(final CoordinatorRegistry
  public void init() {
  JobRegistry.getInstance().setCurrentShardingTotalCount(liteJobConfig.getJobName(), liteJobConfig.getTypeConfig().getCoreConfig().getShardingTotalCount());
  JobScheduleController jobScheduleController = new JobScheduleController(createScheduler(), createJobDetail(liteJobConfig.getTypeConfig().getJobClass()), liteJobConfig.getJobName());
- jobScheduleController.scheduleJob(liteJobConfig.getTypeConfig().getCoreConfig().getCron());
  JobRegistry.getInstance().registerJob(liteJobConfig.getJobName(), jobScheduleController, regCenter);
  schedulerFacade.registerStartUpInfo(liteJobConfig);
+ jobScheduleController.scheduleJob(liteJobConfig.getTypeConfig().getCoreConfig().getCron());
  }
 
  private JobDetail createJobDetail(final String jobClass) {

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
@@ -70,7 +70,8 @@ public ShardingContexts getJobShardingContext(final List<Integer> shardingItems)
  }
 
  private String buildTaskId(final LiteJobConfiguration liteJobConfig, final List<Integer> shardingItems) {
- return Joiner.on("@-@").join(liteJobConfig.getJobName(), Joiner.on(",").join(shardingItems), "READY", JobRegistry.getInstance().getJobInstance(jobName).getJobInstanceId()); 
+ 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); 
  }
 
  private void removeRunningIfMonitorExecution(final boolean monitorExecution, final List<Integer> shardingItems) {