diff options
author | Eike Stepper | 2016-09-09 08:56:58 +0000 |
---|---|---|
committer | Eike Stepper | 2016-09-09 08:56:58 +0000 |
commit | 1949a7c63791ce27888aac4c46cbe93147905227 (patch) | |
tree | ab961a36f3bc251baabcaa394c691aee1c4efa46 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java | |
parent | 4d1c7d43999b9af0f2103842bb4701844b3c7c51 (diff) | |
download | cdo-1949a7c63791ce27888aac4c46cbe93147905227.tar.gz cdo-1949a7c63791ce27888aac4c46cbe93147905227.tar.xz cdo-1949a7c63791ce27888aac4c46cbe93147905227.zip |
[469301] Have abillity to lock a set of locally detached objects atomically
https://bugs.eclipse.org/bugs/show_bug.cgi?id=469301
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index ff9c2cf322..466771a7c1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -1391,15 +1391,15 @@ public class CDOObjectImpl extends MinimalEStoreEObjectImpl implements InternalC */ public static CDOLockState getLockState(InternalCDOObject object) { - if (!FSMUtil.isTransient(object)) + if (FSMUtil.isTransient(object)) { - InternalCDOView view = object.cdoView(); - CDOID id = object.cdoID(); - - return view.getLockStates(Collections.singletonList(id))[0]; + return null; } - return null; + InternalCDOView view = object.cdoView(); + CDOID id = object.cdoID(); + + return view.getLockStates(Collections.singletonList(id))[0]; } /** |