summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2009-12-28 05:20:46 (EST)
committerCaspar De Groot2009-12-28 05:20:46 (EST)
commit6aaff2cb0368bd0e1c149dbf34537cb91c23b52e (patch)
treeaa93f575a6edf6b5c4191192efd2dc7131d09c27
parent3bce1f0c6a2e8b672eb5875bbf2bdbac4d1eba0f (diff)
downloadcdo-6aaff2cb0368bd0e1c149dbf34537cb91c23b52e.zip
cdo-6aaff2cb0368bd0e1c149dbf34537cb91c23b52e.tar.gz
cdo-6aaff2cb0368bd0e1c149dbf34537cb91c23b52e.tar.bz2
[294850] Lock.lock() should invoke conflict resolver in case of conflicts - but doesn't
https://bugs.eclipse.org/bugs/show_bug.cgi?id=294850
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LockObjectsRequest.java22
1 files changed, 0 insertions, 22 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LockObjectsRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LockObjectsRequest.java
index ba5e44d..193bff1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LockObjectsRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/net4j/protocol/LockObjectsRequest.java
@@ -12,10 +12,8 @@ package org.eclipse.emf.internal.cdo.net4j.protocol;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.id.CDOIDAndVersion;
-import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
-import org.eclipse.emf.cdo.transaction.CDOTimeStampContext;
import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.internal.cdo.bundle.OM;
@@ -23,12 +21,7 @@ import org.eclipse.emf.internal.cdo.bundle.OM;
import org.eclipse.net4j.util.concurrent.RWLockManager;
import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.emf.spi.cdo.InternalCDOObject;
-import org.eclipse.emf.spi.cdo.InternalCDOView;
-
import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.Map;
/**
@@ -68,19 +61,4 @@ public class LockObjectsRequest extends SyncRevisionsRequest
lockType == RWLockManager.LockType.READ ? "read" : "write", view.getViewID(), timeout); //$NON-NLS-1$ //$NON-NLS-2$
}
}
-
- @Override
- protected Collection<CDOTimeStampContext> confirming(CDODataInput in) throws IOException
- {
- Collection<CDOTimeStampContext> contexts = super.confirming(in);
- for (CDOTimeStampContext timestampContext : contexts)
- {
- getSession().handleUpdateRevision(timestampContext.getTimeStamp(), timestampContext.getDirtyObjects(),
- timestampContext.getDetachedObjects());
- ((InternalCDOView)view).handleInvalidationWithoutNotification(timestampContext.getDirtyObjects(),
- timestampContext.getDetachedObjects(), new HashSet<InternalCDOObject>(), new HashSet<InternalCDOObject>());
- }
-
- return contexts;
- }
}