From c10f7773e7c2478fb32e5c9a60faed286b35abc9 Mon Sep 17 00:00:00 2001
From: Hyunsun Moon <hyunsun.moon@gmail.com>
Date: Tue, 20 Oct 2015 13:58:02 -0700
Subject: [PATCH] CORD-280 Fix the way to add and remove a node to consistent
 store

Change-Id: Iff55398d0a78acf3cdce8a5b43146f95b562d5a5
---
 .../src/main/java/org/onosproject/cordvtn/CordVtn.java    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
index 2813205b56..4b28a14b63 100644
--- a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
+++ b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
@@ -146,9 +146,7 @@ public class CordVtn implements CordVtnService {
     public void addNode(OvsdbNode ovsdb) {
         checkNotNull(ovsdb);
 
-        if (!nodeStore.containsKey(ovsdb.deviceId())) {
-            nodeStore.put(ovsdb.deviceId(), ovsdb);
-        }
+        nodeStore.putIfAbsent(ovsdb.deviceId(), ovsdb);
 
         if (isNodeConnected(ovsdb)) {
             init(ovsdb);
@@ -161,10 +159,6 @@ public class CordVtn implements CordVtnService {
     public void deleteNode(OvsdbNode ovsdb) {
         checkNotNull(ovsdb);
 
-        if (!nodeStore.containsKey(ovsdb.deviceId())) {
-            return;
-        }
-
         if (deviceService.getDevice(ovsdb.deviceId()) != null) {
             if (deviceService.isAvailable(ovsdb.deviceId())) {
                 log.warn("Cannot delete connected node {}", ovsdb.host());