- if (isConflictFound(execution, currentChoice, conflictExecution, conflictChoice, currRWSet)) {
- createBacktrackingPoint(pushedExecution, pushedChoice, conflictExecution, conflictChoice);
- pushedChoice = conflictChoice;
- pushedExecution = conflictExecution;
+ if (isConflictFound(conflictExecution, conflictChoice, predecessorExecution, predecessorChoice, currRWSet)) {
+ createBacktrackingPoint(conflictExecution, conflictChoice, predecessorExecution, predecessorChoice);
+ newConflictChoice = conflictChoice;
+ newConflictExecution = conflictExecution;