You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/09/20 19:54:16 UTC
[isis] 01/02: ISIS-1976: fixes NPE with homepage lookup
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit cb2673e181f5ee8791373cfed9e2da8aae4cf368
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 20 20:12:45 2018 +0200
ISIS-1976: fixes NPE with homepage lookup
Task-Url: https://issues.apache.org/jira/browse/ISIS-1976
---
.../core/runtime/services/homepage/HomePageProviderServiceDefault.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
index 1667aed..047dede 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/homepage/HomePageProviderServiceDefault.java
@@ -30,6 +30,7 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.homepage.HomePageProviderService;
+import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
@@ -59,6 +60,7 @@ public class HomePageProviderServiceDefault implements HomePageProviderService {
final Optional<Object> homePage = objectActions
.map(objectAction->homePageIfUsable(serviceAdapter, objectAction))
+ .filter(_NullSafe::isPresent)
.findAny();
if(homePage.isPresent()) {