commit 1edc36b4de79efcd7e6474dec24abcc526eb591c
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Jan 24 23:39:06 2018 -0800
committer Ray Milkey <ray@opennetworking.org> Thu Jan 25 15:41:54 2018 -0800
tree 65d7a8d35b40047af6b191374f58f0055d24823d
parent c42dc90bfb12ce143d05d0a1b0a2ba429d0c0276

Various small fixes

Change-Id: I83802169d0d968f7b88d4be2cedba74b15fdd7da

core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 03bfc55..67066fd 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -318,7 +318,7 @@
                     ? deviceClockService.getTimestamp(deviceId)
                     : removalRequest.getOrDefault(deviceId, DEFAULT_TIMESTAMP);
         } catch (IllegalStateException e) {
-            newTimestamp = removalRequest.getOrDefault(deviceDescription, DEFAULT_TIMESTAMP);
+            newTimestamp = removalRequest.getOrDefault(deviceId, DEFAULT_TIMESTAMP);
             isMaster = false;
         }
         final Timestamped<DeviceDescription> deltaDesc = new Timestamped<>(deviceDescription, newTimestamp);