commit ec0e942320ef27932b4173172055151015261d7c
author pierventre <pier@opennetworking.org> Wed Sep 22 11:24:38 2021 +0200
committer Pier Luigi Ventre <pier@opennetworking.org> Thu Sep 23 07:37:00 2021 +0000
tree aefbbbd51fac194ea8bae134190d53c4e7b6cc2a
parent 86f07030f8698704c6d5b28276e1d4888fc2e6c5

[SDFAB-612] Cluster not ready when using recent tost master images

Initialize the local cache before adding the map listener
to prevent npe which are caused by events delivered during
the bootstrap process of the EC map

Change-Id: I823c12ccaa633a11a10d5b5d5fa7250a078ff4c5

core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java b/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
index b94375c..30da74d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/meter/impl/DistributedMeterStore.java
@@ -114,7 +114,8 @@
 
     // Meters id related objects
     private static final String AVAILABLEMETERIDSTORE = "onos-meters-available-store";
-    protected ConcurrentMap<MeterTableKey, DistributedSet<MeterKey>> availableMeterIds;
+    protected final ConcurrentMap<MeterTableKey, DistributedSet<MeterKey>> availableMeterIds =
+            new ConcurrentHashMap<>();
     private static final String METERIDSTORE = "onos-meters-id-store";
     private AtomicCounterMap<MeterTableKey> meterIdGenerators;
 
@@ -177,8 +178,6 @@
                 .withSerializer(APP_KRYO_BUILDER).build();
         metersFeatures.addListener(featuresMapListener);
 
-        availableMeterIds = new ConcurrentHashMap<>();
-
         meterIdGenerators = storageService.<MeterTableKey>atomicCounterMapBuilder()
                 .withName(METERIDSTORE)
                 .withSerializer(Serializer.using(KryoNamespaces.API,