Tolerate empty lists

Rather than throwing a NPE, treat missing lists as empty.

Change-Id: I60184026444829a47c8b26effb41463f2acb52d1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 07c58401192b92a912a9fe477668a8f573cf319e..e346ef283cc057a4cd1bdcd43590c9976a4b4963 100644 (file)
--- 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<Main> 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> urls = shiroConfiguration.getUrls();
-        for (final Urls url : urls) {
+        for (final Urls url : shiroConfiguration.nonnullUrls()) {
             urlsSection.put(url.getPairKey(), url.getPairValue());
         }