From: Jakub Morvay <jmorvay@frinx.io>
Date: Mon, 1 Oct 2018 18:10:29 +0000 (+0200)
Subject: Fix AbstractCommonSubscriber close method
X-Git-Tag: release/neon~126^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fb750ca3247ee1cea29a7b97aa85c9da0fafb16e;p=netconf.git

Fix AbstractCommonSubscriber close method

Check for null registration before trying to close it.

JIRA: NETCONF-565
Change-Id: I23861ce7c1857c00334ca40fac91389200368fed
Signed-off-by: Jakub Morvay <jmorvay@frinx.io>
---

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 41503253bc..2a7ba619c5 100644
--- 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();
     }