[isis] 02/02: ISIS-2811: fix potential NPE in config

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit d9fdb5d9f208e1dba2af1e0cb07d5cff9059b751
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jul 21 08:07:49 2021 +0200

    ISIS-2811: fix potential NPE in config
    
    Arrays.stream(...) is not null-safe
---
 .../src/main/java/org/apache/isis/core/config/IsisConfiguration.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index fcc0e4a..d2a290b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -65,7 +65,10 @@ import org.apache.isis.applib.services.publishing.spi.EntityPropertyChangeSubscr
 import org.apache.isis.applib.services.userreg.EmailNotificationService;
 import org.apache.isis.applib.services.userreg.UserRegistrationService;
 import org.apache.isis.applib.services.userui.UserMenu;
+import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration.Core;
+import org.apache.isis.core.config.IsisConfiguration.Viewer;
 import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
 import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
 import org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
@@ -3421,7 +3424,7 @@ public class IsisConfiguration {
         private final String string;
     }
     private static Map<Pattern, String> asMap(final String... mappings) {
-        return new LinkedHashMap<>(Arrays.stream(mappings).map(mapping -> {
+        return new LinkedHashMap<>(_NullSafe.stream(mappings).map(mapping -> {
             final String[] parts = mapping.split(":");
             if (parts.length != 2) {
                 return null;