Revert "Use RAII for group session iteration (project-chip#32970) (project-chip#33122)"

This reverts commit 29ed2f9.

Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>

Author: adigie

src/transport/SessionManager.cpp

@@ -58,31 +58,6 @@ using Transport::SecureSession;
 namespace {
 Global<GroupPeerTable> gGroupPeerTable;
 
-/// RAII class for iterators that guarantees that Release() will be called
-/// on the underlying type
-template <typename Releasable>
-class AutoRelease
-{
-public:
-    AutoRelease(Releasable * iter) : mIter(iter) {}
-    ~AutoRelease() { Release(); }
-
-    Releasable * operator->() { return mIter; }
-    const Releasable * operator->() const { return mIter; }
-
-    bool IsNull() const { return mIter == nullptr; }
-
-    void Release()
-    {
-        VerifyOrReturn(mIter != nullptr);
-        mIter->Release();
-        mIter = nullptr;
-    }
-
-private:
-    Releasable * mIter = nullptr;
-};
-
 // Helper function that strips off the interface ID from a peer address that is
 // not an IPv6 link-local address.  For any other address type we should rely on
 // the device's routing table to route messages sent.  Forcing messages down a
@@ -908,11 +883,8 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & partialPack
 
     // Trial decryption with GroupDataProvider
     Credentials::GroupDataProvider::GroupSession groupContext;
-
-    AutoRelease<Credentials::GroupDataProvider::GroupSessionIterator> iter(
-        groups->IterateGroupSessions(partialPacketHeader.GetSessionId()));
-
-    if (iter.IsNull())
+    auto iter = groups->IterateGroupSessions(partialPacketHeader.GetSessionId());
+    if (iter == nullptr)
     {
         ChipLogError(Inet, "Failed to retrieve Groups iterator. Discarding everything");
         return;
@@ -959,7 +931,7 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & partialPack
         }
 #endif // CHIP_CONFIG_PRIVACY_ACCEPT_NONSPEC_SVE2
     }
-    iter.Release();
+    iter->Release();
 
     if (!decrypted)
     {
@@ -997,6 +969,7 @@ void SessionManager::SecureGroupMessageDispatch(const PacketHeader & partialPack
         gGroupPeerTable->FindOrAddPeer(groupContext.fabric_index, packetHeaderCopy.GetSourceNodeId().Value(),
                                        packetHeaderCopy.IsSecureSessionControlMsg(), counter))
     {
+
         if (Credentials::GroupDataProvider::SecurityPolicy::kTrustFirst == groupContext.security_policy)
         {
             err = counter->VerifyOrTrustFirstGroup(packetHeaderCopy.GetMessageCounter());