From ebda41346a096c88c41e91c3b06e0ddbe45bc31a Mon Sep 17 00:00:00 2001
From: "Michael N. Lipp" <mnl@mnl.de>
Date: Wed, 29 Jan 2025 21:01:49 +0100
Subject: [PATCH] Simplify permission management.

---
 .../org/jdrupes/vmoperator/vmaccess/VmAccess.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.jdrupes.vmoperator.vmaccess/src/org/jdrupes/vmoperator/vmaccess/VmAccess.java b/org.jdrupes.vmoperator.vmaccess/src/org/jdrupes/vmoperator/vmaccess/VmAccess.java
index eea1eae..c82ccd4 100644
--- a/org.jdrupes.vmoperator.vmaccess/src/org/jdrupes/vmoperator/vmaccess/VmAccess.java
+++ b/org.jdrupes.vmoperator.vmaccess/src/org/jdrupes/vmoperator/vmaccess/VmAccess.java
@@ -546,26 +546,26 @@ public class VmAccess extends FreeMarkerConlet<VmAccess.ResourceModel> {
             .map(ConsoleUser::getName).orElse(null);
         var roles = WebConsoleUtils.rolesFromSession(session)
             .stream().map(ConsoleRole::getName).toList();
-        Set<Permission> result = new HashSet<>();
         if (model.mode() == ResourceModel.Mode.POOL) {
             if (pool == null) {
                 pool = appPipeline.fire(new GetPools()
                     .withName(model.name())).get().stream().findFirst()
                     .orElse(null);
             }
-            if (pool != null) {
-                result.addAll(pool.permissionsFor(user, roles));
+            if (pool == null) {
+                return Collections.emptySet();
             }
+            return pool.permissionsFor(user, roles);
         }
         if (vmDef == null) {
             vmDef = appPipeline.fire(new GetVms().assignedFrom(model.name())
                 .assignedTo(user)).get().stream().map(VmData::definition)
                 .findFirst().orElse(null);
         }
-        if (vmDef != null) {
-            result.addAll(vmDef.permissionsFor(user, roles));
+        if (vmDef == null) {
+            return Collections.emptySet();
         }
-        return result;
+        return vmDef.permissionsFor(user, roles);
     }
 
     private void updatePreview(ConsoleConnection channel, ResourceModel model,