[refactor] SecurityManager IdFunction

Move null check into function sameUserWithSameGroups.
line-o · Dec 12, 2023 · 5ee14e9 · 5ee14e9
1 parent 0adb4aa
commit 5ee14e9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/exist-core/src/main/java/org/exist/xquery/functions/securitymanager/IdFunction.java b/exist-core/src/main/java/org/exist/xquery/functions/securitymanager/IdFunction.java
@@ -33,6 +33,7 @@
 import org.exist.xquery.value.Sequence;
 import org.exist.xquery.value.Type;
 
+import javax.annotation.Nullable;
 import java.util.Arrays;
 
 /**
@@ -85,8 +86,7 @@ private org.exist.dom.memtree.DocumentImpl functionId() {
             }
 
             final Subject effectiveUser = context.getEffectiveUser();
-            if (effectiveUser != null && (
-                    realUser == null || !sameUserWithSameGroups(realUser, effectiveUser))) {
+            if (effectiveUser != null && !sameUserWithSameGroups(realUser, effectiveUser)) {
                 builder.startElement(new QName("effective", SecurityManagerModule.NAMESPACE_URI, SecurityManagerModule.PREFIX), null);
                 subjectToXml(builder, effectiveUser);
                 builder.endElement();
@@ -102,7 +102,10 @@ private org.exist.dom.memtree.DocumentImpl functionId() {
         }
     }
 
-    private static boolean sameUserWithSameGroups(final Subject user1, final Subject user2) {
+    private static boolean sameUserWithSameGroups(@Nullable final Subject user1, @Nullable final Subject user2) {
+        if (user1 == null || user2 == null) {
+            return false;
+        }
         if (user1.getId() != user2.getId()) {
             return false;
         }