X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fimpl%2FDefaultCommitNotificationProducer.java;h=ab37bac683829a95cc4e78ec24bcfb56c584faf1;hp=4461054437ce61ef47fd2eea76a9b23ae15b5ef3;hb=a2563a94253f9c2603e0ab25b8f412ea07fcf51d;hpb=e5a654f6868eb60f2b087f414859f1c74426d6f6 diff --git a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/DefaultCommitNotificationProducer.java b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/DefaultCommitNotificationProducer.java index 4461054437..ab37bac683 100644 --- a/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/DefaultCommitNotificationProducer.java +++ b/opendaylight/netconf/netconf-impl/src/main/java/org/opendaylight/controller/netconf/impl/DefaultCommitNotificationProducer.java @@ -8,13 +8,7 @@ package org.opendaylight.controller.netconf.impl; -import org.opendaylight.controller.netconf.api.jmx.CommitJMXNotification; -import org.opendaylight.controller.netconf.api.jmx.DefaultCommitOperationMXBean; -import org.opendaylight.controller.netconf.api.jmx.NetconfJMXNotification; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.w3c.dom.Element; - +import java.util.Set; import javax.management.InstanceAlreadyExistsException; import javax.management.InstanceNotFoundException; import javax.management.MBeanRegistrationException; @@ -22,12 +16,17 @@ import javax.management.MBeanServer; import javax.management.NotCompliantMBeanException; import javax.management.NotificationBroadcasterSupport; import javax.management.ObjectName; -import java.util.Set; +import org.opendaylight.controller.netconf.api.jmx.CommitJMXNotification; +import org.opendaylight.controller.netconf.api.jmx.DefaultCommitOperationMXBean; +import org.opendaylight.controller.netconf.api.jmx.NetconfJMXNotification; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.w3c.dom.Element; public class DefaultCommitNotificationProducer extends NotificationBroadcasterSupport implements DefaultCommitOperationMXBean, AutoCloseable { - private static final Logger logger = LoggerFactory.getLogger(DefaultCommitNotificationProducer.class); + private static final Logger LOG = LoggerFactory.getLogger(DefaultCommitNotificationProducer.class); private final MBeanServer mbeanServer; @@ -35,6 +34,7 @@ public class DefaultCommitNotificationProducer extends NotificationBroadcasterSu public DefaultCommitNotificationProducer(MBeanServer mBeanServer) { this.mbeanServer = mBeanServer; + LOG.debug("Registering to JMX under {}", on); registerMBean(this, mbeanServer, on); } @@ -42,13 +42,13 @@ public class DefaultCommitNotificationProducer extends NotificationBroadcasterSu try { mbs.registerMBean(instance, on); } catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) { - throw new RuntimeException("Unable to register " + instance + " as " + on, e); + throw new IllegalStateException("Unable to register " + instance + " as " + on, e); } } public void sendCommitNotification(String message, Element cfgSnapshot, Set capabilities) { CommitJMXNotification notif = NetconfJMXNotification.afterCommit(this, message, cfgSnapshot, capabilities); - logger.debug("Notification about commit {} sent", notif); + LOG.debug("Notification about commit {} sent", notif); sendNotification(notif); } @@ -57,7 +57,7 @@ public class DefaultCommitNotificationProducer extends NotificationBroadcasterSu try { mbeanServer.unregisterMBean(on); } catch (InstanceNotFoundException | MBeanRegistrationException e) { - logger.warn("Ignoring exception while unregistering {} as {}", this, on, e); + LOG.warn("Ignoring exception while unregistering {} as {}", this, on, e); } } }