Merge pull request #121 from Azure/isaac/JobEndTime

Return null for EndTime for a job when job is still running
Azure · Jan 9, 2019 · 8e663b1 · 8e663b1
2 parents 24b3f04 + fd03407
commit 8e663b1
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/...r/app/com/microsoft/azure/iotsolutions/iothubmanager/services/models/JobServiceModel.java b/...r/app/com/microsoft/azure/iotsolutions/iothubmanager/services/models/JobServiceModel.java
@@ -31,8 +31,20 @@ public JobServiceModel(JobResult jobResult, List<JobResult> deviceJobs) throws E
         this.queryCondition = jobResult.getQueryCondition();
         this.createdTimeUtc = jobResult.getCreatedTime();
         this.startTimeUtc = jobResult.getStartTime();
-        this.endTimeUtc = jobResult.getEndTime();
+        this.endTimeUtc = null;
         this.maxExecutionTimeInSeconds = jobResult.getMaxExecutionTimeInSeconds();
+
+        switch (JobStatus.valueOf(jobResult.getJobStatus().toString()))
+        {
+            case completed:
+            case failed:
+            case cancelled:
+                this.endTimeUtc = jobResult.getEndTime();
+                break;
+            default:
+                break;
+        }
+
         this.jobType = JobType.fromAzureJobType(jobResult.getJobType());
         this.jobStatus = JobStatus.fromAzureJobStatus(jobResult.getJobStatus());