X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=2021f0addc06b5d7622909d01458b0c71715bdd5;hb=ca6361d9a70f1336c65956f049167135c2a417a8;hp=1e28264fbcedf171c673bace33be6f41c3aa3f35;hpb=502c7029755b194e52526fe26c2e7327b5d64101;p=model-checker.git

diff --git a/action.cc b/action.cc
index 1e28264..2021f0a 100644
--- a/action.cc
+++ b/action.cc
@@ -186,7 +186,7 @@ void ModelAction::read_from(const ModelAction *act)
  * @param act The ModelAction to synchronize with
  */
 void ModelAction::synchronize_with(const ModelAction *act) {
-	ASSERT(*act < *this);
+	ASSERT(*act < *this || type == THREAD_JOIN);
 	model->check_promises(cv, act->cv);
 	cv->merge(act->cv);
 }