Unregister EEM attribute access in destructor

hasty · hasty · commit 3fae3b41e643 · 2024-01-27T15:40:42.000-08:00
diff --git a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp
@@ -44,6 +44,11 @@ CHIP_ERROR ElectricalEnergyMeasurementAttrAccess::Init()
     return CHIP_NO_ERROR;
 }
 
+void ElectricalEnergyMeasurementAttrAccess::Shutdown()
+{
+    unregisterAttributeAccessOverride(this);
+}
+
 CHIP_ERROR ElectricalEnergyMeasurementAttrAccess::Read(const app::ConcreteReadAttributePath & aPath,
                                                        app::AttributeValueEncoder & aEncoder)
 {
diff --git a/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.h b/src/app/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.h
@@ -44,7 +44,11 @@ class ElectricalEnergyMeasurementAttrAccess : public AttributeAccessInterface
         mFeature(aFeature)
     {}
 
+    ~ElectricalEnergyMeasurementAttrAccess() { Shutdown(); }
+
     CHIP_ERROR Init();
+    void Shutdown();
+
     CHIP_ERROR Read(const app::ConcreteReadAttributePath & aPath, app::AttributeValueEncoder & aEncoder) override;
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,11 @@ CHIP_ERROR ElectricalEnergyMeasurementAttrAccess::Init()`
`44`	`44`	`return CHIP_NO_ERROR;`
`45`	`45`	`}`
`46`	`46`
	`47`	`+void ElectricalEnergyMeasurementAttrAccess::Shutdown()`
	`48`	`+{`
	`49`	`+ unregisterAttributeAccessOverride(this);`
	`50`	`+}`
	`51`	`+`
`47`	`52`	`CHIP_ERROR ElectricalEnergyMeasurementAttrAccess::Read(const app::ConcreteReadAttributePath & aPath,`
`48`	`53`	`app::AttributeValueEncoder & aEncoder)`
`49`	`54`	`{`