[isis] 02/07: ISIS-2066: fixes NPE occurring when invoke an action that returns null

[da...@apache.org]

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

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

commit 51f9408a54f79df5986631106ce89d0c203eed0c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 4 08:34:03 2019 +0000

    ISIS-2066: fixes NPE occurring when invoke an action that returns null
    
    fix as per the idiom described here: https://stackoverflow.com/a/32476601/56880
---
 .../java/org/apache/isis/viewer/wicket/model/models/ActionModel.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 2a50608..5109b8c 100644
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -25,6 +25,8 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -471,7 +473,9 @@ public class ActionModel extends BookmarkableModel<ObjectAdapter> implements For
                 final Object routeTo = routingService.route(result);
                 return routeTo != null? getPersistenceSession().adapterFor(routeTo): null;
             })
+            .map(Optional::ofNullable)
             .findFirst()
+            .flatMap(Function.identity())
             .orElse(resultAdapter);
         
     }