Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java16
1 files changed, 3 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
index e0be18394d..49b1bd5440 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDOLegacyWrapper.java
@@ -97,8 +97,6 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
protected InternalCDORevision revision;
- protected CDOLockState lockState;
-
/**
* It could happen that while <i>revisionToInstance()</i> is executed externally the <i>internalPostLoad()</i> method
* will be called. This happens for example if <i>internalPostInvalidate()</i> is called. The leads to another
@@ -127,20 +125,12 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
public synchronized CDOLockState cdoLockState()
{
- if (lockState == null)
+ if (!FSMUtil.isTransient(this) && !FSMUtil.isNew(this))
{
- if (!FSMUtil.isTransient(this) && !FSMUtil.isNew(this))
- {
- lockState = view.getLockStates(Collections.singletonList(id))[0];
- }
+ return view.getLockStates(Collections.singletonList(id))[0];
}
- return lockState;
- }
-
- public synchronized void cdoInternalSetLockState(CDOLockState lockState)
- {
- this.lockState = lockState;
+ return null;
}
@Override

Back to the top