Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ProActive
scheduling
Commits
a55e7602
Unverified
Commit
a55e7602
authored
Jul 22, 2020
by
Fabien Viale
Committed by
GitHub
Jul 22, 2020
Browse files
Merge pull request #3788 from fviale/master
PCA permissions (fix equals)
parents
78654220
6a783a1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
rm/rm-server/src/main/java/org/ow2/proactive/resourcemanager/core/RMCore.java
View file @
a55e7602
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment