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 2022/01/12 08:18:32 UTC
[isis] branch master updated: ISIS-2882: fixes potential NPE
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
The following commit(s) were added to refs/heads/master by this push:
new ecbdbf7 ISIS-2882: fixes potential NPE
ecbdbf7 is described below
commit ecbdbf7acaa01d0ffbb644b4a66bb490cecafb93
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 12 09:18:19 2022 +0100
ISIS-2882: fixes potential NPE
---
.../entity/icontitle/EntityIconAndTitlePanel.java | 25 ++++++++--------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 5d639dd..d6723e2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -140,23 +140,16 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
private AbstractLink createDynamicallyVisibleLink() {
final ObjectAdapterModel entityModel = getModel();
-
- val targetAdapter = entityModel.getObject();
- final ObjectAdapterModel redirectToModel;
-
- if(targetAdapter != null) {
-
- EntityUtil.refetch(targetAdapter);
-
- val redirectToAdapter = entityModel.getTypeOfSpecification().lookupFacet(ProjectionFacet.class)
+ val targetAdapter = EntityUtil.refetch(entityModel.getObject());
+
+ final ObjectAdapterModel redirectToModel =
+ ManagedObjects.isNullOrUnspecifiedOrEmpty(targetAdapter)
+ ? entityModel
+ : EntityModel.ofAdapter(
+ super.getCommonContext(),
+ entityModel.getTypeOfSpecification().lookupFacet(ProjectionFacet.class)
.map(projectionFacet->projectionFacet.projected(targetAdapter))
- .orElse(targetAdapter);
-
- redirectToModel = EntityModel.ofAdapter(super.getCommonContext(), redirectToAdapter);
-
- } else {
- redirectToModel = entityModel;
- }
+ .orElse(targetAdapter));
final PageParameters pageParameters = redirectToModel.getPageParametersWithoutUiHints();