summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2010-02-01 00:14:04 (EST)
committerCaspar De Groot2010-02-01 00:14:04 (EST)
commit5db4117172c617ad88efd4fbc2c628b05c85182c (patch)
treec69e6d9728d399ec4b37d1e370db2e266edd3628
parent07365b12b214ab5b37912e7201807affac2b56ec (diff)
downloadcdo-5db4117172c617ad88efd4fbc2c628b05c85182c.zip
cdo-5db4117172c617ad88efd4fbc2c628b05c85182c.tar.gz
cdo-5db4117172c617ad88efd4fbc2c628b05c85182c.tar.bz2
[270716] Provide support for branching
https://bugs.eclipse.org/bugs/show_bug.cgi?id=270716
-rw-r--r--plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
index 4ef2018..5a6d334 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/ObjectLockedIndication.java
@@ -11,7 +11,7 @@
*/
package org.eclipse.emf.cdo.server.internal.net4j.protocol;
-import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.id.CDOIDAndBranch;
import org.eclipse.emf.cdo.common.io.CDODataInput;
import org.eclipse.emf.cdo.common.io.CDODataOutput;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
@@ -42,15 +42,15 @@ public class ObjectLockedIndication extends CDOReadIndication
InternalLockManager lockManager = getRepository().getLockManager();
LockType lockType = in.readCDOLockType();
- CDOID id = in.readCDOID();
+ CDOIDAndBranch idBranch = in.readCDOIDAndBranch();
boolean byOthers = in.readBoolean();
if (byOthers)
{
- isLocked = lockManager.hasLockByOthers(lockType, view, id);
+ isLocked = lockManager.hasLockByOthers(lockType, view, idBranch.getID());
}
else
{
- isLocked = lockManager.hasLock(lockType, view, id);
+ isLocked = lockManager.hasLock(lockType, view, idBranch.getID());
}
}