From a80545b279f89235397b9ad0186ec0da38413845 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 3 Jul 2022 03:47:20 +0200 Subject: [PATCH] Tolerate empty lists Rather than throwing a NPE, treat missing lists as empty. Change-Id: I60184026444829a47c8b26effb41463f2acb52d1 Signed-off-by: Robert Varga --- .../aaa/shiro/web/env/AAAIniWebEnvironment.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java index 07c584011..e346ef283 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/web/env/AAAIniWebEnvironment.java @@ -7,7 +7,6 @@ */ package org.opendaylight.aaa.shiro.web.env; -import java.util.List; import java.util.function.Supplier; import org.apache.shiro.SecurityUtils; import org.apache.shiro.config.Ini; @@ -70,14 +69,12 @@ class AAAIniWebEnvironment extends IniWebEnvironment { final Ini ini = new Ini(); final Ini.Section mainSection = ini.addSection(MAIN_SECTION_HEADER); - final List
mains = shiroConfiguration.getMain(); - for (final Main main : mains) { + for (final Main main : shiroConfiguration.nonnullMain()) { mainSection.put(main.getPairKey(), main.getPairValue()); } final Ini.Section urlsSection = ini.addSection(URLS_SECTION_HEADER); - final List urls = shiroConfiguration.getUrls(); - for (final Urls url : urls) { + for (final Urls url : shiroConfiguration.nonnullUrls()) { urlsSection.put(url.getPairKey(), url.getPairValue()); } -- 2.36.6