From 2c15821eb8a9d6a7f79b7194b23d84dd8bb773c7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 29 Apr 2021 09:58:08 +0200 Subject: Allow active objects to remain on list after call to clear() --- odb/sqlite/connection.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'odb/sqlite/connection.cxx') diff --git a/odb/sqlite/connection.cxx b/odb/sqlite/connection.cxx index c9e5d75..cdd4c20 100644 --- a/odb/sqlite/connection.cxx +++ b/odb/sqlite/connection.cxx @@ -187,11 +187,19 @@ namespace odb { invalidate_results (); - // The current first active_object will remove itself from the list - // and make the second object (if any) the new first. + // The current first active_object may remove itself from the list and + // make the second object (if any) the new first. // - while (active_objects_ != 0) - active_objects_->clear (); + for (active_object** pp (&active_objects_); *pp != nullptr; ) + { + active_object* p (*pp); + p->clear (); + + // Move to the next object if this one decided to stay on the list. + // + if (*pp == p) + pp = &p->next_; + } } // connection_factory -- cgit v1.1