Slight flash improvement

Author: andreilitvin

src/app/ReadHandler.cpp

@@ -15,6 +15,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+#include "app/AttributePathExpandIterator.h"
 #include "lib/support/CodeUtils.h"
 #include <app/AppConfig.h>
 #include <app/InteractionModelEngine.h>
@@ -854,18 +855,11 @@ void ReadHandler::ResetPathIterator()
 
 void ReadHandler::AttributePathIsDirty(DataModel::Provider * apDataModel, const AttributePathParams & aAttributeChanged)
 {
-    bool bHasNext = false;
-    ConcreteAttributePath path;
-
     mDirtyGeneration = mManagementCallback.GetInteractionModelEngine()->GetReportingEngine().GetDirtySetGeneration();
 
-    {
-        // Inside a separate block, to allow the read and rollback to happen as one unit.
-        // we want to look at what `next` would be but not actually change state as we need to reset the
-        // current cluster
-        PeekAttributePathExpandIterator iterator(apDataModel, mAttributePathExpandState);
-        bHasNext = iterator.Next(path);
-    }
+    // we want to get the value, but not advance the state
+    AttributePathExpandIterator::State tempState = mAttributePathExpandState;
+    ConcreteAttributePath path;
 
     // We won't reset the path iterator for every AttributePathIsDirty call to reduce the number of full data reports.
     // The iterator will be reset after finishing each report session.
@@ -876,7 +870,8 @@ void ReadHandler::AttributePathIsDirty(DataModel::Provider * apDataModel, const
     // TODO (#16699): Currently we can only guarantee the reports generated from a single path in the request are consistent. The
     // data might be inconsistent if the user send a request with two paths from the same cluster. We need to clearify the behavior
     // or make it consistent.
-    if (bHasNext && (aAttributeChanged.HasWildcardEndpointId() || aAttributeChanged.mEndpointId == path.mEndpointId) &&
+    if (AttributePathExpandIterator(apDataModel, tempState).Next(path) &&
+        (aAttributeChanged.HasWildcardEndpointId() || aAttributeChanged.mEndpointId == path.mEndpointId) &&
         (aAttributeChanged.HasWildcardClusterId() || aAttributeChanged.mClusterId == path.mClusterId))
     {
         ChipLogDetail(DataManagement,