From ddf67b3a8626524b4e0e509bec62f73702ee5453 Mon Sep 17 00:00:00 2001 From: Kamal Rameshan Date: Fri, 13 Nov 2015 11:26:21 -0800 Subject: [PATCH 1/1] Bug-4636: NotificationSubscriber's exception prevents notifications to other listeners Catch the exception and log it with enough context. Change-Id: I23c248c59753008e6d09155513b2dba108fbccbf Signed-off-by: Kamal Rameshan Signed-off-by: Robert Varga --- .../dom/broker/impl/DOMNotificationRouterEvent.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java index 65c7166ac9..85f93a6238 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java @@ -15,12 +15,15 @@ import java.util.Collection; import org.opendaylight.controller.md.sal.dom.api.DOMNotification; import org.opendaylight.controller.md.sal.dom.api.DOMNotificationListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A single notification event in the disruptor ringbuffer. These objects are reused, * so they do have mutable state. */ final class DOMNotificationRouterEvent { + private static final Logger LOG = LoggerFactory.getLogger(DOMNotificationRouterEvent.class); public static final EventFactory FACTORY = new EventFactory() { @Override public DOMNotificationRouterEvent newInstance() { @@ -45,9 +48,13 @@ final class DOMNotificationRouterEvent { void deliverNotification() { for (ListenerRegistration r : subscribers) { - final DOMNotificationListener l = r.getInstance(); - if (l != null) { - l.onNotification(notification); + final DOMNotificationListener listener = r.getInstance(); + if (listener != null) { + try { + listener.onNotification(notification); + } catch (Exception e) { + LOG.error("Delivery of notification {} caused an error in listener {}", notification, listener, e); + } } } } -- 2.36.6