Unregister EEM attribute access in destructor

project-chip · Jan 27, 2024 · 3fae3b4 · 3fae3b4
1 parent 272ca37
commit 3fae3b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/...pp/clusters/electrical-energy-measurement-server/electrical-energy-measurement-server.cpp b/...pp/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: