commit 68e080c19c1fb6262bda38be863071d7adb7200d
author jaegonkim <jaegon.kim@gmail.com> Thu Dec 01 22:31:01 2016 +0900
committer Thomas Vachuska <tom@onlab.us> Fri Dec 02 16:24:17 2016 +0000
tree 51750eb279bb9b3b630e1c5856c256c0a3eb7fbe
parent fd339c4181e4f7e39a019373420189247461e5a1

ONOS-5699 Null pointer exception can occur after null checking

Change-Id: Idf53a199c52d14aa73c1a28c374fac75b7d9a214

core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index a1f9e9b..c6ee95e 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -1119,7 +1119,7 @@
             log.trace("received groupid map event {} for id {} in device {}",
                       mapEvent.type(),
                       group.id(),
-                      key.deviceId());
+                      (key != null ? key.deviceId() : null));
             if (mapEvent.type() == MapEvent.Type.INSERT || mapEvent.type() == MapEvent.Type.UPDATE) {
                 // Update the group ID table
                 getGroupIdTable(group.deviceId()).put(group.id(), group);