[580991] Outdated lock state when releasing a durable lock

https://bugs.eclipse.org/bugs/show_bug.cgi?id=580991

1 files changed, 14 insertions, 0 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
index 819aba63df..2d6f01cf67 100644
--- a/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server.net4j/src/org/eclipse/emf/cdo/server/internal/net4j/protocol/LockAreaIndication.java
@@ -10,11 +10,15 @@
  */
 package org.eclipse.emf.cdo.server.internal.net4j.protocol;
 
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.lock.CDOLockOwner;
 import org.eclipse.emf.cdo.common.lock.IDurableLockingManager.LockArea;
 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.spi.server.InternalLockManager;
+import org.eclipse.emf.cdo.spi.server.InternalSession;
+import org.eclipse.emf.cdo.spi.server.InternalSessionManager;
 import org.eclipse.emf.cdo.spi.server.InternalView;
 
 import java.io.IOException;
@@ -42,10 +46,20 @@ public class LockAreaIndication extends CDOServerWriteIndication
     boolean create = in.readBoolean();
     if (create)
     {
+      CDOLockOwner oldOwner = view.getLockOwner();
       LockArea area = lockManager.createLockArea(view);
 
       result = area.getDurableLockingID();
       view.setDurableLockingID(result);
+
+      CDOLockOwner newOwner = view.getLockOwner();
+      if (newOwner != oldOwner)
+      {
+        CDOBranch branch = view.getBranch();
+        InternalSession session = view.getSession();
+        InternalSessionManager manager = session.getManager();
+        manager.sendLockOwnerRemappedNotification(session, branch, oldOwner, newOwner);
+      }
     }
     else
     {