MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:vm: Clear existing eval txn on entry side instead of unwind.

Browse source
This commit is contained in:
Jason Volk 2020-09-29 10:21:06 -07:00
parent fb823e3d40
commit 7034fadd64
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
matrix/vm_execute.cc
View file

@ -571,11 +571,6 @@ ircd::m::vm::execute_pdu(eval &eval,
sequence::pending sequence::pending
}; };
const scope_restore remove_txn
{
eval.txn, std::shared_ptr<db::txn>{}
};
const scope_notify sequence_dock const scope_notify sequence_dock
{ {
sequence::dock, scope_notify::all sequence::dock, scope_notify::all
@ -843,6 +838,9 @@ ircd::m::vm::execute_pdu(eval &eval,
eval.phase, phase::INDEX eval.phase, phase::INDEX
}; };
if(eval.txn)
eval.txn->clear();
if(!eval.txn && parent_post) if(!eval.txn && parent_post)
eval.txn = eval.parent->txn; eval.txn = eval.parent->txn;