projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
model: bugfix - detect conflicts properly
[model-checker.git]
/
model.cc
diff --git
a/model.cc
b/model.cc
index 82e65202510076338130dea1d51488e52fa1b720..19570ffc2914fda9ccb003a73836a525fb96de83 100644
(file)
--- 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;