From b52ea9e73e9b723b37a79df7401e74416fd76d70 Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Sat, 3 Dec 2022 20:07:29 +0100 Subject: [PATCH] Prevent NPE in SseResource (#3194) Signed-off-by: Kai Kreuzer --- .../org/openhab/core/io/rest/sse/SseResource.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java index 0d89ab9a0..94575e63e 100644 --- a/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java +++ b/bundles/org.openhab.core.io.rest.sse/src/main/java/org/openhab/core/io/rest/sse/SseResource.java @@ -123,11 +123,13 @@ public class SseResource implements RESTResource, SsePublisher { this.itemStatesEventBuilder = itemStatesEventBuilder; aliveEventJob = scheduler.scheduleWithFixedDelay(() -> { - logger.debug("Sending alive event to SSE connections"); - OutboundSseEvent aliveEvent = sse.newEventBuilder().name("alive").mediaType(MediaType.APPLICATION_JSON_TYPE) - .data(new AliveEvent()).build(); - itemStatesBroadcaster.send(aliveEvent); - topicBroadcaster.send(aliveEvent); + if (sse != null) { + logger.debug("Sending alive event to SSE connections"); + OutboundSseEvent aliveEvent = sse.newEventBuilder().name("alive") + .mediaType(MediaType.APPLICATION_JSON_TYPE).data(new AliveEvent()).build(); + itemStatesBroadcaster.send(aliveEvent); + topicBroadcaster.send(aliveEvent); + } }, 1, ALIVE_INTERVAL_SECONDS, TimeUnit.SECONDS); }