Fix AbstractCommonSubscriber close method

[netconf.git] / restconf / restconf-nb-bierman02 / src / main / java / org / opendaylight / netconf / sal / streams / listeners / AbstractCommonSubscriber.java

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java
index 877deda59f31cdb1363858a9b116412b55728c7b..2a7ba619c59a543fcedd6815912b458977396941 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/streams/listeners/AbstractCommonSubscriber.java
@@ -51,8 +51,11 @@ abstract class AbstractCommonSubscriber extends AbstractQueryParams implements B
 
     @Override
     public final void close() {
-        this.registration.close();
-        this.registration = null;
+        if (registration != null) {
+            this.registration.close();
+            this.registration = null;
+        }
+
         unregister();
     }
 
@@ -65,7 +68,7 @@ abstract class AbstractCommonSubscriber extends AbstractQueryParams implements B
      */
     public void addSubscriber(final Channel subscriber) {
         if (!subscriber.isActive()) {
-            LOG.debug("Channel is not active between websocket server and subscriber {}" + subscriber.remoteAddress());
+            LOG.debug("Channel is not active between websocket server and subscriber {}", subscriber.remoteAddress());
         }
         final Event event = new Event(EventType.REGISTER);
         event.setSubscriber(subscriber);