commit 8f60ff8dcdad5b0cddcfe2627d67b2c15e6e61cf
author Simon Hunt <simon@onlab.us> Mon Apr 24 17:19:30 2017 -0700
committer Simon Hunt <simon@onlab.us> Wed Apr 26 16:42:59 2017 +0000
tree ec3b36ddbcd3574f04fa5aabb9157bb08c5fb30e
parent 588969102dd8dfdabd287517010df9e810082363

ONOS-6257: fixing Region-peer-location function...

- corrected UiRegion.isRoot() implementation
- added to/from-compact-strings for LayoutLocation, so we can encode
   a list of them in an annotation
- Fixed bug in DistributedRegionStore which was emiting events that
   had a null region as subject.

Change-Id: I547e0c7f62385b85b191b8d63e6b569196623b84

core/store/dist/src/main/java/org/onosproject/store/region/impl/DistributedRegionStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/region/impl/DistributedRegionStore.java b/core/store/dist/src/main/java/org/onosproject/store/region/impl/DistributedRegionStore.java
index e00af16..c8b5299 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/region/impl/DistributedRegionStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/region/impl/DistributedRegionStore.java
@@ -247,9 +247,12 @@
         @Override
         public void event(MapEvent<RegionId, Set<DeviceId>> event) {
             if (event.type() != MapEvent.Type.REMOVE) {
-                notifyDelegate(new RegionEvent(REGION_MEMBERSHIP_CHANGED,
-                        regionsById.get(event.key()),
-                        event.newValue().value()));
+                Region r = regionsById.get(event.key());
+                if (r != null) {
+                    notifyDelegate(new RegionEvent(REGION_MEMBERSHIP_CHANGED,
+                                                   r,
+                                                   event.newValue().value()));
+                }
             }
         }
     }