Unverified Commit a55e7602 authored by Fabien Viale's avatar Fabien Viale Committed by GitHub
Browse files

Merge pull request #3788 from fviale/master

PCA permissions (fix equals)
parents 78654220 6a783a1e
......@@ -3114,7 +3114,7 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
}
if (allNodes.containsKey(nodeUrl)) {
RMNode rmNode = allNodes.get(nodeUrl);
if (rmNode.isBusy() && rmNode.getOwner() != null && rmNode.getOwner().equals(getCurrentUser())) {
if (rmNode.isBusy() && rmNode.getOwner() != null && rmNode.getOwner().equals(caller)) {
// current user has the right to add a token to reserve it for further usage
} else {
// if not, check that the request initiator is a node administrator
......@@ -3148,7 +3148,7 @@ public class RMCore implements ResourceManager, InitActive, RunActive {
}
if (allNodes.containsKey(nodeUrl)) {
RMNode rmNode = allNodes.get(nodeUrl);
if (rmNode.isBusy() && rmNode.getOwner() != null && rmNode.getOwner().equals(getCurrentUser())) {
if (rmNode.isBusy() && rmNode.getOwner() != null && rmNode.getOwner().equals(caller)) {
// current user has the right to add a token to reserve it for further usage
} else {
checkNodeAdminPermission(rmNode, caller);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment