[469301] Have abillity to lock a set of locally detached objects atomically

https://bugs.eclipse.org/bugs/show_bug.cgi?id=469301

2 files changed, 11 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 11a8184b85..ee091e349e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -1271,10 +1271,10 @@ public abstract class AbstractCDOView extends CDOCommitHistoryProviderImpl<CDOOb
     List<CDOID> ids = new ArrayList<CDOID>();
     for (CDOObject object : objects)
     {
-      InternalCDORevision revision = getRevision(object);
-      if (revision != null)
+      CDOID id = getID((InternalCDOObject)object, true);
+      if (id != null)
       {
-        ids.add(revision.getID());
+        ids.add(id);
       }
     }
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index 3e76bdc971..6322ba8f9e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -657,6 +657,14 @@ public class CDOViewImpl extends AbstractCDOView implements IExecutorServiceProv
                 }
               }
             }
+            else if (FSMUtil.isTransient(object))
+            {
+              CDOID id = getID((InternalCDOObject)object, true);
+              if (id != null)
+              {
+                objectIDs.add(id);
+              }
+            }
             else
             {
               objectIDs.add(object.cdoID());