diff options
| author | Eike Stepper | 2015-09-13 13:01:04 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-09-13 13:01:04 +0000 |
| commit | 65d335a670ad3ccc0777482f7cf4134c890d05c1 (patch) | |
| tree | c3dd2b12f7370ebbdaff561c7b429aa2bc2ad7a7 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction | |
| parent | 73969d5eb69779c1ca2a13fa36a9e9d2fa0b9630 (diff) | |
| download | cdo-65d335a670ad3ccc0777482f7cf4134c890d05c1.tar.gz cdo-65d335a670ad3ccc0777482f7cf4134c890d05c1.tar.xz cdo-65d335a670ad3ccc0777482f7cf4134c890d05c1.zip | |
[467442] Add Interactive Transaction Conflict Resolution
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467442
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index 2654d2984d..bde1aa96ee 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -412,7 +412,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa public boolean hasConflict() { checkActive(); - return conflict != 0; + return conflict > 0; } public void setConflict(InternalCDOObject object) @@ -431,7 +431,10 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa { synchronized (this) { - --conflict; + if (conflict > 0) + { + --conflict; + } } } |