| commit | 247dfd82a5c5316fa4ea8a0147b401fd25a8796f | [log] [tgz] |
|---|---|---|
| author | sivachidambaram subramanian <sisubram@partner.ciena.com> | Wed Apr 12 11:36:12 2017 +0530 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Mon Aug 14 20:50:16 2017 +0000 |
| tree | 7aed334806abc3a9f4f889bcd8952e352efc822c | |
| parent | ee14a8b496265016162e212c39bfadbc5190808c [diff] |
[ONOS-6266] 'garbageCollect' is not working for groups after ONOS restart Change-Id: I4285d610f245ee987fa876c7ba951fe926854b19
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 5fea69a..ebeb0e2 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
@@ -164,8 +164,9 @@ @Activate - public void activate() { + public void activate(ComponentContext context) { cfgService.registerProperties(getClass()); + modified(context); KryoNamespace.Builder kryoBuilder = new KryoNamespace.Builder() .register(KryoNamespaces.API) .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID)
diff --git a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java index e9cebef..3c75df5 100644 --- a/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java +++ b/core/store/dist/src/test/java/org/onosproject/store/group/impl/DistributedGroupStoreTest.java
@@ -133,7 +133,7 @@ groupStoreImpl.clusterCommunicator = new ClusterCommunicationServiceAdapter(); groupStoreImpl.mastershipService = new MasterOfAll(); groupStoreImpl.cfgService = new ComponentConfigAdapter(); - groupStoreImpl.activate(); + groupStoreImpl.activate(null); groupStore = groupStoreImpl; auditPendingReqQueue = TestUtils.getField(groupStoreImpl, "auditPendingReqQueue");