From 247dfd82a5c5316fa4ea8a0147b401fd25a8796f Mon Sep 17 00:00:00 2001
From: sivachidambaram subramanian <sisubram@partner.ciena.com>
Date: Wed, 12 Apr 2017 11:36:12 +0530
Subject: [PATCH] [ONOS-6266] 'garbageCollect' is not working for groups after
 ONOS restart

Change-Id: I4285d610f245ee987fa876c7ba951fe926854b19
---
 .../onosproject/store/group/impl/DistributedGroupStore.java    | 3 ++-
 .../store/group/impl/DistributedGroupStoreTest.java            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 5fea69af18..ebeb0e2e29 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 @@ public class DistributedGroupStore
 
 
     @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 e9cebeffba..3c75df5115 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 @@ public class DistributedGroupStoreTest {
         groupStoreImpl.clusterCommunicator = new ClusterCommunicationServiceAdapter();
         groupStoreImpl.mastershipService = new MasterOfAll();
         groupStoreImpl.cfgService = new ComponentConfigAdapter();
-        groupStoreImpl.activate();
+        groupStoreImpl.activate(null);
         groupStore = groupStoreImpl;
         auditPendingReqQueue =
                 TestUtils.getField(groupStoreImpl, "auditPendingReqQueue");