Merge pull request #3972 from dseurotech/fix-npeOnUnknownDomain

:fix: avoid npe on unknown domain
eclipse-kapua · Feb 19, 2024 · b5f9539 · b5f9539
2 parents 60e6b95 + 1f00b46
commit b5f9539
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...iro/src/main/java/org/eclipse/kapua/service/authorization/shiro/PermissionMapperImpl.java b/...iro/src/main/java/org/eclipse/kapua/service/authorization/shiro/PermissionMapperImpl.java
@@ -33,6 +33,7 @@
 import org.eclipse.kapua.service.authorization.group.Group;
 
 import javax.inject.Inject;
+import java.util.Optional;
 
 public class PermissionMapperImpl implements PermissionMapper {
     private final DomainRegistryService domainService;
@@ -195,7 +196,7 @@ private void checkTargetPermissionIsGroupable(org.eclipse.kapua.service.authoriz
                 try {
                     org.eclipse.kapua.service.authorization.domain.Domain domainDefinition = KapuaSecurityUtils.doPrivileged(() -> domainService.findByName(targetPermission.getDomain()));
 
-                    if (!domainDefinition.getGroupable()) {
+                    if (Optional.ofNullable(domainDefinition).map(d -> !d.getGroupable()).orElse(false)) {
                         this.setGroupId(null);
                     }
                 } catch (Exception e) {