This is an automated email from the ASF dual-hosted git repository. elecharny pushed a commit to branch 1.2.X in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/1.2.X by this push: new 4087d6be Simplified the authority handling 4087d6be is described below commit 4087d6be35d65db111a50fa31725432ad40f1786 Author: emmanuel lecharny <elecha...@apache.org> AuthorDate: Wed Jul 12 09:44:39 2023 +0200 Simplified the authority handling --- .../org/apache/ftpserver/usermanager/impl/BaseUser.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java b/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java index 95a66994..8be3edc4 100644 --- a/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java +++ b/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java @@ -183,26 +183,13 @@ public class BaseUser implements User { return null; } - boolean someoneCouldAuthorize = false; for (Authority authority : authorities) { if (authority.canAuthorize(request)) { - someoneCouldAuthorize = true; - - request = authority.authorize(request); - - // authorization failed, return null - if (request == null) { - return null; - } + return authority.authorize(request); } - } - if (someoneCouldAuthorize) { - return request; - } else { - return null; - } + return null; } /**