This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new e4e2dcaf21 REvert previous fix. NPE should never happen here.
e4e2dcaf21 is described below
commit e4e2dcaf219185a106dfe0f9b19925c24214704b
Author: Mark Thomas <[email protected]>
AuthorDate: Tue May 26 18:26:34 2026 +0100
REvert previous fix. NPE should never happen here.
---
java/org/apache/catalina/realm/JAASMemoryLoginModule.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
index a80780152b..6cde8608e0 100644
--- a/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
+++ b/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
@@ -317,10 +317,8 @@ public class JAASMemoryLoginModule extends MemoryRealm
implements LoginModule {
public boolean logout() throws LoginException {
subject.getPrincipals().remove(principal);
if (principal instanceof GenericPrincipal) {
- if (roles != null) {
- for (Principal role : roles) {
- subject.getPrincipals().remove(role);
- }
+ for (Principal role : roles) {
+ subject.getPrincipals().remove(role);
}
}
committed = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
