Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2010-11-15 03:35:31 +0000
committerCaspar De Groot2010-11-15 03:35:31 +0000
commitfdc39bcef6faa0c8591b7f652fc5e6f311e68878 (patch)
treeba769925a5d0f9f8d3d670243d63a17db473f523 /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo
parentd838c1011858929372a8f75610681d23ca0d5d1a (diff)
downloadcdo-fdc39bcef6faa0c8591b7f652fc5e6f311e68878.tar.gz
cdo-fdc39bcef6faa0c8591b7f652fc5e6f311e68878.tar.xz
cdo-fdc39bcef6faa0c8591b7f652fc5e6f311e68878.zip
[328681] LockObjectsRequest can cause corruption of client-side graph
https://bugs.eclipse.org/bugs/show_bug.cgi?id=328681
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index bedcee5ccd..9b0e5419ed 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -121,11 +121,10 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
public boolean cancelQuery(int queryId);
/**
- * @since 3.0
+ * @since 4.0
*/
- public RefreshSessionResult lockObjects(long lastUpdateTime,
- Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int viewID, LockType lockType, long timeout)
- throws InterruptedException;
+ public boolean lockObjects(List<InternalCDORevision> viewedRevisions, int viewID, CDOBranch viewedBranch,
+ LockType lockType, long timeout) throws InterruptedException;
/**
* @since 3.0

Back to the top