From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 16 Jul 2018 22:58:50 +0000 (+0200)
Subject: Do not retain reference to DOMRpcRouter in registrations
X-Git-Tag: release/fluorine~73
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=ba74663993b356fa285197ffd6d3574b72df9fd2;p=mdsal.git

Do not retain reference to DOMRpcRouter in registrations

Once we have called removeListener() we will not interact with
the DOMRpcRouter, hence there is no need to retain a reference
to it.

Change-Id: I788646e91370ed15e246a95ac5585fbc4c897ac9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
index a3a0cfac5c..fe3acf8a8f 100644
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
@@ -164,9 +164,8 @@ public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcP
     private static final class Registration<T extends DOMRpcAvailabilityListener>
         extends AbstractListenerRegistration<T> {
 
-        private final DOMRpcRouter router;
-
         private Map<SchemaPath, Set<YangInstanceIdentifier>> prevRpcs;
+        private DOMRpcRouter router;
 
         Registration(final DOMRpcRouter router, final T listener,
                 final Map<SchemaPath, Set<YangInstanceIdentifier>> rpcs) {
@@ -178,6 +177,7 @@ public final class DOMRpcRouter implements AutoCloseable, DOMRpcService, DOMRpcP
         @Override
         protected void removeRegistration() {
             router.removeListener(this);
+            router = null;
         }
 
         void initialTable() {