| commit | 4beea653817c1368c873c8c2c8a965d8bc4b987a | [log] [tgz] |
|---|---|---|
| author | sisubram <sisubram@partner.ciena.com> | Wed Aug 09 10:38:14 2017 +0000 |
| committer | Thomas Vachuska <tom@opennetworking.org> | Mon Aug 14 20:49:54 2017 +0000 |
| tree | 11d618305ce98137cf463eefc8e28c40aae8324b | |
| parent | 1a100a98f4029deadbd87aadfeb3a93f39470481 [diff] |
[ONOS-6266] 'garbageCollect' is not working for groups after ONOS restart Change-Id: I1e2a5c78d64f8f5cec6352011f3fc6362c9937e5
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 b8d4e03..df8a99c 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
@@ -167,8 +167,9 @@ private boolean allowExtraneousGroups = ALLOW_EXTRANEOUS_GROUPS; @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 e6d92ec..3e25bd6 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
@@ -132,7 +132,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");