Issue #5909 Update after review

Signed-off-by: Jan Bartel <janb@webtide.com>
jetty · Feb 2, 2021 · 2c412ac · 2c412ac
1 parent cc4b6ec
commit 2c412ac
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/RoleInfo.java b/jetty-security/src/main/java/org/eclipse/jetty/security/RoleInfo.java
@@ -143,12 +143,12 @@ public void combine(RoleInfo other)
         else if (other._checked)
         {
             setChecked(true);
+            if (other._isAnyAuth)
+                setAnyAuth(true);
             if (other._isAnyRole)
                 setAnyRole(true);
-            else if (other._isAnyAuth)
-                setAnyAuth(true);
-            else if (!_isAnyRole)
-                _roles.addAll(other._roles);
+
+            _roles.addAll(other._roles);
         }
         setUserDataConstraint(other._userDataConstraint);
     }