Skip to content
Snippets Groups Projects
Commit 281ae111 authored by srosse's avatar srosse
Browse files

OO-756: check the key of the owner of lockentry instead of user name as the...

OO-756: check the key of the owner of lockentry instead of user name as the user name can be changed after the user be deleted
parent f32c2536
No related branches found
No related tags found
No related merge requests found
...@@ -170,6 +170,7 @@ public abstract class ClusterLocker implements Locker, GenericEventListener { ...@@ -170,6 +170,7 @@ public abstract class ClusterLocker implements Locker, GenericEventListener {
* Use 'releaseLock' as method to release a lock. * Use 'releaseLock' as method to release a lock.
* @param lock release this lockentry * @param lock release this lockentry
*/ */
@Override
public void releaseLockEntry(LockEntry lockEntry) { public void releaseLockEntry(LockEntry lockEntry) {
String asset = lockEntry.getKey(); String asset = lockEntry.getKey();
Identity releaseRequestor = lockEntry.getOwner(); Identity releaseRequestor = lockEntry.getOwner();
...@@ -184,7 +185,7 @@ public abstract class ClusterLocker implements Locker, GenericEventListener { ...@@ -184,7 +185,7 @@ public abstract class ClusterLocker implements Locker, GenericEventListener {
} else { } else {
// check that entry was previously locked by the same user that now wants to release the lock. // check that entry was previously locked by the same user that now wants to release the lock.
Identity ownwer = li.getOwner(); Identity ownwer = li.getOwner();
if (releaseRequestor.getName().equals(ownwer.getName())) { if (releaseRequestor.getKey().equals(ownwer.getKey())) {
// delete the lock // delete the lock
clusterLockManager.deleteLock(li); clusterLockManager.deleteLock(li);
} else { } else {
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
*/ */
package org.olat.core.util.coordinate; package org.olat.core.util.coordinate;
import java.io.Serializable;
import org.olat.core.id.Identity; import org.olat.core.id.Identity;
/** /**
* Description: <br> * Description: <br>
...@@ -32,7 +34,10 @@ import org.olat.core.id.Identity; ...@@ -32,7 +34,10 @@ import org.olat.core.id.Identity;
* *
* @author Felix Jost * @author Felix Jost
*/ */
public class LockEntry { public class LockEntry implements Serializable {
private static final long serialVersionUID = -319510836505419325L;
private long lockAquiredTime; private long lockAquiredTime;
private Identity owner; private Identity owner;
private final String key; private final String key;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment