1 files changed, 30 insertions, 9 deletions

diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
index e22b164419..b7f12fb9a3 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/LockObjectsRequest.java
@@ -11,21 +11,22 @@
 package org.eclipse.emf.cdo.internal.net4j.protocol;
 
 import org.eclipse.emf.cdo.common.branch.CDOBranch;
-import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.protocol.CDODataInput;
 import org.eclipse.emf.cdo.common.protocol.CDODataOutput;
 import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 
 import org.eclipse.net4j.util.concurrent.IRWLockManager;
+import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
 
 import java.io.IOException;
-import java.util.Map;
+import java.util.List;
 
 /**
  * @author Eike Stepper
  */
-public class LockObjectsRequest extends RefreshSessionRequest
+public class LockObjectsRequest extends CDOClientRequest<Boolean>
 {
   private int viewID;
 
@@ -33,23 +34,43 @@ public class LockObjectsRequest extends RefreshSessionRequest
 
   private long timeout;
 
-  public LockObjectsRequest(CDOClientProtocol protocol, long lastUpdateTime,
-      Map<CDOBranch, Map<CDOID, InternalCDORevision>> viewedRevisions, int viewID, IRWLockManager.LockType lockType,
-      long timeout)
+  private List<InternalCDORevision> viewedRevisions;
+
+  /**
+   * The branch being viewed
+   */
+  private CDOBranch viewedBranch;
+
+  public LockObjectsRequest(CDOClientProtocol protocol, List<InternalCDORevision> viewedRevisions, int viewID,
+      CDOBranch viewedBranch, LockType lockType, long timeout)
   {
-    super(protocol, CDOProtocolConstants.SIGNAL_LOCK_OBJECTS, lastUpdateTime, viewedRevisions, CDORevision.UNCHUNKED,
-        false);
+    super(protocol, CDOProtocolConstants.SIGNAL_LOCK_OBJECTS);
+
     this.viewID = viewID;
     this.lockType = lockType;
     this.timeout = timeout;
+    this.viewedRevisions = viewedRevisions;
+    this.viewedBranch = viewedBranch;
   }
 
   @Override
   protected void requesting(CDODataOutput out) throws IOException
   {
-    super.requesting(out);
     out.writeInt(viewID);
     out.writeCDOLockType(lockType);
     out.writeLong(timeout);
+    out.writeCDOBranch(viewedBranch);
+
+    out.writeInt(viewedRevisions.size());
+    for (CDORevision revision : viewedRevisions)
+    {
+      out.writeCDORevisionKey(revision);
+    }
+  }
+
+  @Override
+  protected Boolean confirming(CDODataInput in) throws IOException
+  {
+    return in.readBoolean();
   }
 }