From a6deffdd7c805a47e021b2cc7a8acc9c51531ca0 Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harshach@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:49:03 -0700
Subject: [PATCH] Fix failing tests in Task Resolution (#15634)

---
 .../java/org/openmetadata/service/jdbi3/FeedRepository.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java
index 813dfcdc313..becdc7cad13 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java
@@ -805,7 +805,9 @@ public class FeedRepository {
     // Allow if user created the task to close task (and not resolve task)
     EntityReference owner = Entity.getOwner(aboutRef);
     List<EntityReference> assignees = thread.getTask().getAssignees();
-    if (owner.getName().equals(userName) || closeTask && thread.getCreatedBy().equals(userName)) {
+    if (owner != null
+        && (owner.getName().equals(userName)
+            || closeTask && thread.getCreatedBy().equals(userName))) {
       return;
     }