From c60bc86ea0042408fda05a4a7588992aefc10ea1 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Thu, 26 Apr 2012 12:05:08 -0700
Subject: [PATCH] model: bugfix - detect conflicts properly

Finding a conflict from the same thread does not mean we should quit the search
with no found conflict; we just continue to the next search item.
---
 model.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model.cc b/model.cc
index 82e6520..19570ff 100644
--- a/model.cc
+++ b/model.cc
@@ -146,7 +146,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
 			continue;
 		/* Conflict from the same thread is not really a conflict */
 		if (id == prev->get_tid())
-			return NULL;
+			continue;
 		return prev;
 	}
 	return NULL;
-- 
2.34.1