demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix MQTT crashes when subscriber throws exception (#3719)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K
2023-07-21 17:37:57 +02:00
committed by GitHub
parent 7a87001f98
commit 573c94b560
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.io.transport.mqtt/src/main/java/org/openhab/core/io/transport/mqtt/internal/Subscription.java
+11 -2
View File
@@ -18,6 +18,9 @@ import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.io.transport.mqtt.MqttMessageSubscriber;
import org.openhab.core.util.HexUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hivemq.client.mqtt.mqtt3.message.publish.Mqtt3Publish;
import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
@@ -31,6 +34,7 @@ import com.hivemq.client.mqtt.mqtt5.message.publish.Mqtt5Publish;
*/
@NonNullByDefault
public class Subscription {
private final Logger logger = LoggerFactory.getLogger(Subscription.class);
private final Map<String, byte[]> retainedMessages = new ConcurrentHashMap<>();
private final Collection<MqttMessageSubscriber> subscribers = ConcurrentHashMap.newKeySet();
@@ -81,10 +85,15 @@ public class Subscription {
if (retain || retainedMessages.containsKey(topic)) {
retainedMessages.put(topic, payload);
}
subscribers.stream().forEach(subscriber -> processMessage(subscriber, topic, payload));
subscribers.forEach(subscriber -> processMessage(subscriber, topic, payload));
}
private void processMessage(MqttMessageSubscriber subscriber, String topic, byte[] payload) {
subscriber.processMessage(topic, payload);
try {
subscriber.processMessage(topic, payload);
} catch (RuntimeException e) {
logger.warn("A subscriber of type '{}' failed to process message '{}' to topic '{}'.",
subscriber.getClass(), HexUtils.bytesToHex(payload), topic);
}
}
}