Skip to content

Clean up logic for Series::close() #1840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
franzpoeschel wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Clean up logic for Series::close() #1840

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Series.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3280,10 +3280,12 @@ namespace internal
if (this->m_sharedStatefulIterator)
{
this->m_sharedStatefulIterator->close();
this->m_sharedStatefulIterator.reset();
}
Series impl;
impl.setData({this, [](auto const *) {}});
if (auto IOHandler = impl.IOHandler(); IOHandler &&
auto IOHandler = impl.IOHandler();
if (IOHandler &&
/*
* Scenario: A user calls `Series::flush()` but does not check for
* thrown exceptions. The exception will propagate further up,
Expand Down Expand Up @@ -3317,7 +3319,7 @@ namespace internal
// This releases the openPMD hierarchy
iterations.container().clear();
// Release the IO Handler
if (operator*().m_writable.IOHandler)
if (IOHandler)
{
*operator*().m_writable.IOHandler = std::nullopt;
}
Expand Down
Loading