File tree Expand file tree Collapse file tree 1 file changed +5
-7
lines changed
include/xrpl/beast/utility Expand file tree Collapse file tree 1 file changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -458,17 +458,15 @@ class Journal
458
458
Journal (
459
459
Journal const & other,
460
460
std::optional<JsonLogAttributes> attributes = std::nullopt )
461
- : m_sink(other.m_sink)
461
+ : m_attributes(other.m_attributes)
462
+ , m_sink(other.m_sink)
462
463
{
463
464
if (attributes.has_value ())
464
- m_attributes = std::move (attributes.value ());
465
- if (other.m_attributes .has_value ())
466
465
{
467
- if (m_attributes.has_value ())
468
- m_attributes->combine (
469
- other.m_attributes ->contextValues_ );
466
+ if (m_attributes)
467
+ m_attributes->combine (attributes->contextValues_ );
470
468
else
471
- m_attributes = other. m_attributes ;
469
+ m_attributes = std::move (attributes) ;
472
470
}
473
471
}
474
472
/* * Create a journal that writes to the specified sink. */
You can’t perform that action at this time.
0 commit comments