releaseNodeState() should not care about the PCEPSession

We only need the InetAddress, make sure to reduce exposure.

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

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
index d501fdd08dc2b5e2de57601d3900b5b800ff9352..df1be1c1bc96ed82c9d260acb33611639860bc87 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
@@ -237,7 +237,7 @@ public abstract class AbstractTopologySessionListener<S, L> implements TopologyS
         requireNonNull(psession);
         synchronized (serverSessionManager) {
             synchronized (this) {
-                serverSessionManager.releaseNodeState(nodeState, psession, isLspDbPersisted());
+                serverSessionManager.releaseNodeState(nodeState, psession.getRemoteAddress(), isLspDbPersisted());
                 clearNodeState();
 
                 try {

diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
index 9febacadc7f6a0b052523247580486f47b8ee682..20440f3a78e94a20502528b97f299b68980d94ec 100644 (file)
--- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
+++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java
@@ -27,7 +27,6 @@ import org.opendaylight.bgpcep.pcep.server.PceServerProvider;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.protocol.pcep.PCEPSession;
 import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.graph.rev191125.graph.topology.GraphKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.PcepSessionState;
@@ -156,13 +155,13 @@ class ServerSessionManager implements PCEPSessionListenerFactory, TopologySessio
         return future;
     }
 
-    final synchronized void releaseNodeState(final TopologyNodeState nodeState, final PCEPSession session,
+    final synchronized void releaseNodeState(final TopologyNodeState nodeState, final InetAddress peerAddress,
             final boolean persistNode) {
         if (isClosed.get()) {
             LOG.error("Session Manager has already been closed.");
             return;
         }
-        final NodeId nodeId = createNodeId(session.getRemoteAddress());
+        final NodeId nodeId = createNodeId(peerAddress);
         nodes.remove(nodeId);
         state.remove(nodeId);
         if (nodeState != null) {