From 3a4e118d45bf83a3b4c3a0a73d1071fa8fe5476d Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 17 Apr 2013 10:50:25 -0700 Subject: [PATCH] execution: bugfix - no action "conflicts" with itself --- execution.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/execution.cc b/execution.cc index fc23706..a74147b 100644 --- a/execution.cc +++ b/execution.cc @@ -380,6 +380,8 @@ ModelAction * ModelExecution::get_last_conflict(ModelAction *act) const action_list_t::reverse_iterator rit; for (rit = list->rbegin(); rit != list->rend(); rit++) { ModelAction *prev = *rit; + if (prev == act) + continue; if (prev->could_synchronize_with(act)) { ret = prev; break; -- 2.34.1