Merge "ClusterSingletonService cleaning FRM/FRS"

[openflowplugin.git] / applications / forwardingrules-manager / src / main / java / org / opendaylight / openflowplugin / applications / frm / impl / FlowNodeConnectorInventoryTranslatorImpl.java

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java
index 8a34a7785e49b79345886089bd8799360431fb44..d6cbb5c9221d9b5a0575470476d4a4cbeef53060 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeConnectorInventoryTranslatorImpl.java
@@ -65,7 +65,7 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends AbstractNodeConnec
             });
         } catch (final Exception e) {
             LOG.warn(" FlowNodeConnectorInventoryTranslatorImpl listener registration fail!");
-            LOG.debug("FlowNodeConnectorInventoryTranslatorImpl DataChange listener registration fail ..", e);
+            LOG.debug("FlowNodeConnectorInventoryTranslatorImpl DataTreeChangeListener registration fail ..", e);
             throw new IllegalStateException("FlowNodeConnectorInventoryTranslatorImpl startup fail! System needs restart.", e);
         }
     }
@@ -97,7 +97,6 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends AbstractNodeConnec
             String sNodeConnectorIdentifier = nodeConnIdent
                     .firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId().getValue();
             BigInteger nDpId = getDpIdFromPortName(sNodeConnectorIdentifier);
-            String portName = del.getName();
 
             dpnToPortMultiMap.remove(nDpId, sNodeConnectorIdentifier);
         }
@@ -107,7 +106,7 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends AbstractNodeConnec
     public void update(InstanceIdentifier<FlowCapableNodeConnector> identifier, FlowCapableNodeConnector original, FlowCapableNodeConnector update, InstanceIdentifier<FlowCapableNodeConnector> nodeConnIdent) {
         if(compareInstanceIdentifierTail(identifier,II_TO_FLOW_CAPABLE_NODE_CONNECTOR)){
             LOG.debug("Node Connector updated");
-            //donot need to do anything as we are not considering updates here
+            //Don't need to do anything as we are not considering updates here
         }
     }
 
@@ -119,7 +118,6 @@ public class FlowNodeConnectorInventoryTranslatorImpl extends AbstractNodeConnec
                     .firstKeyOf(NodeConnector.class, NodeConnectorKey.class).getId().getValue();
             BigInteger nDpId = getDpIdFromPortName(sNodeConnectorIdentifier);
 
-            String portName = add.getName();
             if(!dpnToPortMultiMap.containsEntry(nDpId,sNodeConnectorIdentifier)) {
                 dpnToPortMultiMap.put(nDpId, sNodeConnectorIdentifier);
             }else{