From 2557feef3b777e9b7b0de959d571f0973cd21d76 Mon Sep 17 00:00:00 2001 From: Vivek Ratnavel Subramanian Date: Tue, 4 Oct 2022 12:46:50 -0700 Subject: [PATCH] Fix #7900 Backend: Fix NPE in tests (#7902) --- .../org/openmetadata/service/events/ChangeEventHandler.java | 2 +- .../org/openmetadata/service/events/WebhookPublisher.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java index 75490626ea5..8fc8db64389 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/ChangeEventHandler.java @@ -104,7 +104,7 @@ public class ChangeEventHandler implements EventHandler { if (filterEnabled) { for (var thread : listOrEmpty(getThreads(responseContext, loggedInUserName))) { // Don't create a thread if there is no message - if (!thread.getMessage().isEmpty()) { + if (thread.getMessage() != null && !thread.getMessage().isEmpty()) { EntityInterface entity; // In case of ENTITY_FIELDS_CHANGED entity from responseContext will be a ChangeEvent if (responseContext.getEntity() instanceof ChangeEvent) { diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/events/WebhookPublisher.java b/openmetadata-service/src/main/java/org/openmetadata/service/events/WebhookPublisher.java index 12a714d7977..3ef20eec7ec 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/events/WebhookPublisher.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/events/WebhookPublisher.java @@ -200,9 +200,11 @@ public class WebhookPublisher extends AbstractEventPublisher { } } catch (Exception ex) { Throwable cause = ex.getCause(); - if (cause.getClass() == UnknownHostException.class) { + if (cause != null && cause.getClass() == UnknownHostException.class) { LOG.warn("Invalid webhook {} endpoint {}", webhook.getName(), webhook.getEndpoint()); setErrorStatus(attemptTime, null, "UnknownHostException"); + } else { + LOG.debug("Exception occurred while publishing webhook", ex); } } }