Skip to content
GitLab
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
6a783a1e
Commit
6a783a1e
authored
Jul 22, 2020
by
Fabien Viale
Browse files
PCA permissions (fix equals)
- fix equals usage in add/remove node tokens
parent
be40d471
Changes
1
Hide whitespace changes
Inline
Side-by-side
rm/rm-server/src/main/java/org/ow2/proactive/resourcemanager/core/RMCore.java
View file @
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
);
...
...
Git Mirror User
@gitmirror
mentioned in commit
95e22eb1
·
Aug 04, 2020
mentioned in commit
95e22eb1
mentioned in commit 95e22eb1ef445b07022d24e767f4e888bf6422a2
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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