Merge "NETCONF-526 : edit-config payload default-operation needs to be set to default...

[netconf.git] / netconf / callhome-provider / src / main / java / org / opendaylight / netconf / callhome / mount / CallHomeMountSessionManager.java

diff --git a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionManager.java b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionManager.java
index e700a145cabf4d3b2c40a86c2c16a3bafa8f755a..f26d6ba421bbb4a78e6c6ca966919d079457a942 100644 (file)
--- a/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionManager.java
+++ b/netconf/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionManager.java
@@ -23,8 +23,10 @@ import org.opendaylight.netconf.callhome.protocol.CallHomeProtocolSessionContext
 
 public class CallHomeMountSessionManager implements CallHomeMountSessionContext.CloseCallback {
 
-    private final ConcurrentMap<SocketAddress, CallHomeMountSessionContext> contextByAddress = new ConcurrentHashMap<>();
-    private final Multimap<PublicKey, CallHomeMountSessionContext> contextByPublicKey = MultimapBuilder.hashKeys().hashSetValues().build();
+    private final ConcurrentMap<SocketAddress, CallHomeMountSessionContext> contextByAddress =
+        new ConcurrentHashMap<>();
+    private final Multimap<PublicKey, CallHomeMountSessionContext> contextByPublicKey = MultimapBuilder.hashKeys()
+        .hashSetValues().build();
 
     @Nullable
     public CallHomeMountSessionContext getByAddress(InetSocketAddress remoteAddr) {
@@ -37,14 +39,14 @@ public class CallHomeMountSessionManager implements CallHomeMountSessionContext.
     }
 
     CallHomeMountSessionContext createSession(CallHomeProtocolSessionContext session,
-            CallHomeChannelActivator activator, final CloseCallback onCloseHandler) {
+                                              CallHomeChannelActivator activator, final CloseCallback onCloseHandler) {
 
         String name = session.getSessionName();
         CallHomeMountSessionContext deviceContext = new CallHomeMountSessionContext(name,
                 session, activator, devCtxt -> {
-                CallHomeMountSessionManager.this.onClosed(devCtxt);
-                onCloseHandler.onClosed(devCtxt);
-            });
+            CallHomeMountSessionManager.this.onClosed(devCtxt);
+            onCloseHandler.onClosed(devCtxt);
+        });
 
         contextByAddress.put(deviceContext.getRemoteAddress(), deviceContext);
         contextByPublicKey.put(deviceContext.getRemoteServerKey(), deviceContext);
@@ -55,6 +57,6 @@ public class CallHomeMountSessionManager implements CallHomeMountSessionContext.
     @Override
     public synchronized void onClosed(CallHomeMountSessionContext deviceContext) {
         contextByAddress.remove(deviceContext.getRemoteAddress());
-        contextByPublicKey.remove(deviceContext.getRemoteServerKey(),deviceContext);
+        contextByPublicKey.remove(deviceContext.getRemoteServerKey(), deviceContext);
     }
 }