X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FEntityOwnershipStatistics.java;h=02bd00bfb1e43a7dfcd01c7fb98f85f64529f387;hb=a05824023cb4f527ed38eacb78dda2ee1424a3ef;hp=3ea4362ac9b2a08190ea368a7e6b4e24c55cafbd;hpb=ac3065a7d9b6666aa51c1507d9e8143a0cb4db07;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
index 3ea4362ac9..02bd00bfb1 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipStatistics.java
@@ -65,7 +65,10 @@ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener {
     }
 
     Map<String, Long> byEntityType(String entityType){
-        return statistics.get(entityType).readOnlySnapshot();
+        if(statistics.get(entityType) != null) {
+            return statistics.get(entityType).readOnlySnapshot();
+        }
+        return new HashMap<>();
     }
 
     private void updateStatistics(String entityType, String candidateName, long count){