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 2020/06/22 10:57:48 UTC
[isis] branch master updated: ISIS-2340: fixes potential NPE in
TitleFacetViaTitleAnnotation
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 8500cb2 ISIS-2340: fixes potential NPE in TitleFacetViaTitleAnnotation
8500cb2 is described below
commit 8500cb28e4fb08594d0501c8a27b01e015d8d85f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jun 22 12:57:29 2020 +0200
ISIS-2340: fixes potential NPE in TitleFacetViaTitleAnnotation
---
.../object/title/annotation/TitleFacetViaTitleAnnotation.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index 9b54596..eec6146 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -120,12 +120,16 @@ public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
@Override
public String title(ManagedObject contextAdapter, ManagedObject targetAdapter) {
+ val pojo = targetAdapter.getPojo();
+ if(pojo==null) {
+ return "";
+ }
val stringBuilder = new StringBuilder();
val objectManager = getObjectManager();
-
+
try {
for (final TitleComponent component : this.components) {
- final Object titlePart = component.getTitleEvaluator().value(targetAdapter.getPojo());
+ final Object titlePart = component.getTitleEvaluator().value(pojo);
if (titlePart == null) {
continue;
}