Tweaks to avoid unncessary .toString

- includes removing redundant if check

Change-Id: I16b71a0d839b683bdfd279e6d466c3bc02cf0e06
Signed-off-by: Edw7n <n.edwin.anthony@ericsson.com>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepStateListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepStateListener.java
index 7dc43fcbf3dcc3e6fb1623717a2795140861012e..0ec87951f30a4948d747f8eb9b64fd0a0fb5a387 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepStateListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepStateListener.java
@@ -57,11 +57,12 @@ public class DpnTepStateListener extends AbstractTunnelListenerBase<DpnsTeps> {
         for (RemoteDpns remoteDpns : dpnsTeps.getRemoteDpns()) {
             //Process the unprocessed NodeConnector for the Tunnel, if present in the UnprocessedNodeConnectorCache
             // This may run in all node as its ClusteredDTCN but cache will be populated in only the Entity owner
+            String tunnelName = remoteDpns.getTunnelName();
             try {
-                directTunnelUtils.getTunnelLocks().lock(remoteDpns.getTunnelName());
-                NodeConnectorInfo nodeConnectorInfo = unprocessedNCCache.remove(remoteDpns.getTunnelName());
+                directTunnelUtils.getTunnelLocks().lock(tunnelName);
+                NodeConnectorInfo nodeConnectorInfo = unprocessedNCCache.remove(tunnelName);
                 if (nodeConnectorInfo != null) {
-                    LOG.debug("Processing the Unprocessed NodeConnector for Tunnel {}", remoteDpns.getTunnelName());
+                    LOG.debug("Processing the Unprocessed NodeConnector for Tunnel {}", tunnelName);
                     // Queue the IntefaceAddWorkerForUnprocessNC in DJC
                     String portName = nodeConnectorInfo.getNodeConnector().getName();
                     InterfaceStateAddWorkerForUnprocessedNC ifStateAddWorker =
@@ -70,7 +71,7 @@ public class DpnTepStateListener extends AbstractTunnelListenerBase<DpnsTeps> {
                     coordinator.enqueueJob(portName, ifStateAddWorker, ITMConstants.JOB_MAX_RETRIES);
                 }
             } finally {
-                directTunnelUtils.getTunnelLocks().unlock(remoteDpns.getTunnelName());
+                directTunnelUtils.getTunnelLocks().unlock(tunnelName);
             }
         }
     }

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepsInfoListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepsInfoListener.java
index 5cc52ce4c6de0326db0e85fd4bfa6bdaca9882aa..0d7babcc11de9025bf059fb05ce65c3b2b7deed1 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepsInfoListener.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/DpnTepsInfoListener.java
@@ -59,10 +59,10 @@ public class DpnTepsInfoListener extends AbstractTunnelListenerBase<DPNTEPsInfo>
         if (interfaceManager.isItmDirectTunnelsEnabled()) {
             //Process the unprocessed NodeConnector for the Tunnel, if present in the UnprocessedNodeConnectorEndPtCache
             // This may run in all node as its ClusteredDTCN but cache will be populated in only the Entity owner
+            String dpnId = dpnTepsInfo.getDPNID().toString();
             try {
-                directTunnelUtils.getTunnelLocks().lock(dpnTepsInfo.getDPNID().toString());
-                Collection<NodeConnectorInfo> nodeConnectorInfoList = unprocessedNodeConnectorEndPointCache.get(
-                        dpnTepsInfo.getDPNID().toString());
+                directTunnelUtils.getTunnelLocks().lock(dpnId);
+                Collection<NodeConnectorInfo> nodeConnectorInfoList = unprocessedNodeConnectorEndPointCache.get(dpnId);
                 if (nodeConnectorInfoList != null) {
                     for (NodeConnectorInfo ncInfo : nodeConnectorInfoList) {
                         LOG.debug("Processing the Unprocessed NodeConnector for Tunnel {}", ncInfo
@@ -75,11 +75,11 @@ public class DpnTepsInfoListener extends AbstractTunnelListenerBase<DPNTEPsInfo>
                                         ncInfo.getNodeConnector(), portName);
                         coordinator.enqueueJob(portName, ifStateAddWorker, ITMConstants.JOB_MAX_RETRIES);
                         // Remove the NodeConnector Entry from UnprocessedNodeConnectorEndPt Map
-                        unprocessedNodeConnectorEndPointCache.remove(dpnTepsInfo.getDPNID().toString(), ncInfo);
+                        unprocessedNodeConnectorEndPointCache.remove(dpnId, ncInfo);
                     }
                 }
             } finally {
-                directTunnelUtils.getTunnelLocks().unlock(dpnTepsInfo.getDPNID().toString());
+                directTunnelUtils.getTunnelLocks().unlock(dpnId);
             }
         }
     }