[gobblin] branch master updated: [GOBBLIN-1414] Fix NPE when flow status is null

[suvasude]

This is an automated email from the ASF dual-hosted git repository.

suvasude pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new 02421fc  [GOBBLIN-1414] Fix NPE when flow status is null
02421fc is described below

commit 02421fc39e5fe2c131d5776f0b7ecc12ea3c804b
Author: Jack Moseley <jmose...@linkedin.com>
AuthorDate: Mon Mar 22 11:03:39 2021 -0700

    [GOBBLIN-1414] Fix NPE when flow status is null
    
    Closes #3247 from jack-moseley/flowstatus-npe
---
 .../src/main/java/org/apache/gobblin/service/FlowStatusResource.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowStatusResource.java
 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowStatusResource.java
index 2940d10..062af97 100644
--- 
a/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowStatusResource.java
+++ 
b/gobblin-restli/gobblin-flow-config-service/gobblin-flow-config-service-server/src/main/java/org/apache/gobblin/service/FlowStatusResource.java
@@ -82,6 +82,9 @@ public class FlowStatusResource extends 
ComplexKeyResourceTemplate<FlowStatusId,
    * @return a {@link org.apache.gobblin.service.FlowStatus} converted from a 
{@link org.apache.gobblin.service.monitoring.FlowStatus}
    */
   private FlowStatus 
convertFlowStatus(org.apache.gobblin.service.monitoring.FlowStatus 
monitoringFlowStatus) {
+    if (monitoringFlowStatus == null) {
+      return null;
+    }
     FlowExecution flowExecution = 
FlowExecutionResourceLocalHandler.convertFlowStatus(monitoringFlowStatus);
     return new FlowStatus()
         .setId(flowExecution.getId())