diff options
| author | Eike Stepper | 2007-11-07 15:09:13 +0000 |
|---|---|---|
| committer | Eike Stepper | 2007-11-07 15:09:13 +0000 |
| commit | 7726e19ca0834ab1117003e08d35deea2c7ff020 (patch) | |
| tree | 4d62f524317cc7040690789c7f4312bd52502942 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java | |
| parent | a98533e794568b7a2fe000457f198e5b134404f3 (diff) | |
| download | cdo-7726e19ca0834ab1117003e08d35deea2c7ff020.tar.gz cdo-7726e19ca0834ab1117003e08d35deea2c7ff020.tar.xz cdo-7726e19ca0834ab1117003e08d35deea2c7ff020.zip | |
[209036] Offer RollbackTransactionDialog on save conflict
https://bugs.eclipse.org/bugs/show_bug.cgi?id=209036
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java index ea857c213f..22759d44b9 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java @@ -227,7 +227,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction } } - public void rollback() + public void rollback(boolean remote) { checkWritable(); @@ -254,7 +254,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction { for (CDOObject dirtyObject : dirtyObjects.values()) { - CDOStateMachine.INSTANCE.rollback((InternalCDOObject)dirtyObject); + CDOStateMachine.INSTANCE.rollback((InternalCDOObject)dirtyObject, remote); } } |