diff options
| author | Simon McDuff | 2009-05-05 17:18:22 +0000 |
|---|---|---|
| committer | Simon McDuff | 2009-05-05 17:18:22 +0000 |
| commit | a02b77d129b156a9b2f890c9ccc7f3b92bff5c8d (patch) | |
| tree | 6b0937c3bc827a7b64260b8b363aed79399ab9d1 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo | |
| parent | 2eb469923825c61b07548b638aee35f3d2ec2985 (diff) | |
| download | cdo-a02b77d129b156a9b2f890c9ccc7f3b92bff5c8d.tar.gz cdo-a02b77d129b156a9b2f890c9ccc7f3b92bff5c8d.tar.xz cdo-a02b77d129b156a9b2f890c9ccc7f3b92bff5c8d.zip | |
[273565] Concurrency problem: attribute of enumeration type not updated correctly between two clients
https://bugs.eclipse.org/bugs/show_bug.cgi?id=273565
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java | 2 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java index 9393edbadf..84a1b1f909 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOLock.java @@ -18,7 +18,7 @@ import org.eclipse.net4j.util.concurrent.RWLockManager; import java.util.concurrent.locks.Lock; /** - * TODO Simon: JavaDoc + * Once object got lock, it will not go in conflict mode or cannot be changed. * * @author Simon McDuff * @since 2.0 diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java index f43e9f4bf3..9aad67fadd 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java @@ -271,6 +271,9 @@ public interface CDOView extends CDOCommonView, INotifier, IOptionsContainer */ public int reload(CDOObject... objects); + /** + * Locks the given objects. Once the objects are locked, they will not be changed remotely or go in conflict state. + */ public void lockObjects(Collection<? extends CDOObject> objects, RWLockManager.LockType lockType, long timeout) throws InterruptedException; |