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 c3adb9ba2214e79c5d8d2b55711247013bb92129 Author: Andi Huber <ahu...@apache.org> AuthorDate: Tue May 5 09:10:05 2020 +0200 ISIS-2340: fixes regression, now that null is not ignored when memoized as memento --- .../apache/isis/viewer/wicket/model/models/EntityCollectionModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java index d8a3318..353d269 100644 --- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java +++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java @@ -106,6 +106,7 @@ implements LinksProvider, UiHintContainer { final ObjectMementoService mementoService = model.getMementoService(); final List<ObjectMemento> mementoList = streamElementsOf(collectionAsAdapter) // pojos + .filter(_NullSafe::isPresent) .peek(lowestCommonSuperclassFinder::collect) .map(mementoService::mementoForPojo) .collect(Collectors.toList());