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/08/04 15:00:30 UTC
[isis] branch master updated: ISIS-3112: fixes potential NPE in MarkupPanelFactories.StandaloneAbstract
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 f3a6341acb ISIS-3112: fixes potential NPE in MarkupPanelFactories.StandaloneAbstract<T>
f3a6341acb is described below
commit f3a6341acbdd8778eefef818776683d58cb22362
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Aug 4 17:00:24 2022 +0200
ISIS-3112: fixes potential NPE in
MarkupPanelFactories.StandaloneAbstract<T>
---
.../wicket/ui/components/scalars/markup/MarkupPanelFactories.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
index afa8b8988e..02e769c4ff 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
@@ -24,6 +24,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
import org.apache.isis.applib.value.Markup;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.viewer.commons.model.components.ComponentType;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
@@ -104,11 +105,12 @@ public class MarkupPanelFactories {
val valueModel = (ValueModel) model;
val objectAdapter = valueModel.getObject();
- if(objectAdapter==null) {
+ if(ManagedObjects.isNullOrUnspecifiedOrEmpty(objectAdapter)) {
return ApplicationAdvice.DOES_NOT_APPLY;
}
- return appliesIf( valueType.isAssignableFrom(objectAdapter.getSpecification().getCorrespondingClass()) );
+ return appliesIf(valueType.isAssignableFrom(
+ objectAdapter.getSpecification().getCorrespondingClass()) );
}
@Override