diff options
author | Eike Stepper | 2011-11-06 07:27:19 +0000 |
---|---|---|
committer | Eike Stepper | 2011-11-06 07:27:19 +0000 |
commit | 28fc188eae6e327becc8bab022c911e3f3577636 (patch) | |
tree | c097c162425db85b1f25b98e28682d5e91c68f8a | |
parent | c733e9ad4f13af4562dc2faf692044c7ea66d760 (diff) | |
download | cdo-28fc188eae6e327becc8bab022c911e3f3577636.tar.gz cdo-28fc188eae6e327becc8bab022c911e3f3577636.tar.xz cdo-28fc188eae6e327becc8bab022c911e3f3577636.zip |
whitespace changed
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java | 2 |
2 files changed, 3 insertions, 3 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 eb8ffd7e3f..586571863d 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 @@ -1188,10 +1188,10 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec { InternalCDOView view = object.cdoView(); CDOID id = object.cdoID(); - + return view.getLockStates(Collections.singletonList(id))[0]; } - + return null; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java index 1986f32fe1..1ad4e443f7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/object/CDODeltaNotificationImpl.java @@ -96,7 +96,7 @@ public class CDODeltaNotificationImpl extends ENotificationImpl implements CDODe // Do nothing } } - + if (object instanceof CDOObject) { object = CDOUtil.getEObject((EObject)object); |