diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src')
6 files changed, 9 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/AbstractSyncRevisionsRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/AbstractSyncRevisionsRequest.java index 8f447ed197..79d094f9ce 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/AbstractSyncRevisionsRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/AbstractSyncRevisionsRequest.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Simon McDuff - initial API and implementation * Eike Stepper - maintenance @@ -121,6 +121,7 @@ public abstract class AbstractSyncRevisionsRequest extends CDOClientRequest<Coll ((CDOTimeStampContextImpl)timestampContext).setDirtyObjects(dirtyObjects); ((CDOTimeStampContextImpl)timestampContext).setDetachedObjects(detachedObjects); } + return Collections.unmodifiableCollection(mapofContext.values()); } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/SyncRevisionsRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/SyncRevisionsRequest.java index 65ed4b1fd1..b3982417cf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/SyncRevisionsRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/SyncRevisionsRequest.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Simon McDuff - initial API and implementation * Eike Stepper - maintenance @@ -29,7 +29,6 @@ import java.util.Map; */ public class SyncRevisionsRequest extends AbstractSyncRevisionsRequest { - public SyncRevisionsRequest(CDOClientProtocol protocol, Map<CDOID, CDOIDAndVersion> idAndVersions, int referenceChunk) { this(protocol, CDOProtocolConstants.SIGNAL_SYNC_REVISIONS, idAndVersions, referenceChunk); @@ -51,6 +50,7 @@ public class SyncRevisionsRequest extends AbstractSyncRevisionsRequest getSession().handleSyncResponse(timestampContext.getTimeStamp(), emptyNewPackageUnits, timestampContext.getDirtyObjects(), timestampContext.getDetachedObjects()); } + return contexts; } } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java index d2022f9576..5459a9b217 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDORevisionManagerImpl.java @@ -141,7 +141,6 @@ public class CDORevisionManagerImpl extends CDORevisionResolverImpl implements C { throw WrappedException.wrap(ex); } - } @Override diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java index a323935063..afd8021dd8 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java @@ -289,7 +289,6 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa public void getCDOIDAndVersion(Map<CDOID, CDOIDAndVersion> uniqueObjects, Collection<? extends CDOObject> cdoObjects) { Map<CDOID, CDORevisionDelta> deltaMap = getRevisionDeltas(); - for (CDOObject cdoObject : cdoObjects) { CDORevision cdoRevision = CDOStateMachine.INSTANCE.readNoLoad((InternalCDOObject)cdoObject); @@ -305,6 +304,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa version = delta.getOriginVersion(); } } + uniqueObjects.put(cdoId, CDOIDUtil.createIDAndVersion(cdoId, version)); } } 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 20e8bf313b..aff42b181e 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 @@ -289,6 +289,7 @@ public class CDOViewImpl extends Lifecycle implements InternalCDOView .put(object.cdoID(), CDOIDUtil.createIDAndVersion(object.cdoID(), CDORevision.UNSPECIFIED_VERSION)); } } + session.getSessionProtocol().lockObjects(this, uniqueObjects, timeout, lockType); } @@ -1157,6 +1158,7 @@ public class CDOViewImpl extends Lifecycle implements InternalCDOView { dirtyObject = objects.get(dirtyOID.getID()); } + if (dirtyObject != null) { CDOStateMachine.INSTANCE.invalidate(dirtyObject, dirtyOID.getVersion()); @@ -1172,6 +1174,7 @@ public class CDOViewImpl extends Lifecycle implements InternalCDOView } } } + for (CDOID id : detachedOIDs) { InternalCDOObject detachedObject = removeObject(id); @@ -1190,6 +1193,7 @@ public class CDOViewImpl extends Lifecycle implements InternalCDOView } } } + return conflicts; } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java index d5b1b3d422..0af8feb333 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/InternalCDOSession.java @@ -52,5 +52,4 @@ public interface InternalCDOSession extends CDOSession, CDOIDObjectFactory, */ public void handleUpdateRevision(final long timeStamp, Set<CDOIDAndVersion> dirtyOIDs, Collection<CDOID> detachedObjects); - } |