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 bfd3b2f ISIS-2950: [RO Viewer] fixes PropertyReprRenderer to handle
null values
bfd3b2f is described below
commit bfd3b2fd32722ae15c8317a9d2d21e4784fd62d4
Author: Andi Huber <[email protected]>
AuthorDate: Sat Jan 29 09:33:30 2022 +0100
ISIS-2950: [RO Viewer] fixes PropertyReprRenderer to handle null values
---
.../rendering/domainobjects/ObjectPropertyReprRenderer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
index c469200..996bb8f 100644
---
a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
+++
b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/ObjectPropertyReprRenderer.java
@@ -34,6 +34,7 @@ import
org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxFractionalDigitsFacet;
import
org.apache.isis.core.metamodel.facets.objectvalue.digits.MaxTotalDigitsFacet;
import org.apache.isis.core.metamodel.interactions.managed.ManagedProperty;
+import org.apache.isis.core.metamodel.spec.ManagedObjects;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -88,7 +89,7 @@ extends AbstractObjectMemberReprRenderer<OneToOneAssociation>
{
val valueAdapterIfAny = objectMember.get(objectAdapter,
getInteractionInitiatedBy());
// use the runtime type if we have a value, otherwise the compile time
type of the member
- val spec = valueAdapterIfAny != null
+ val spec = ManagedObjects.isSpecified(valueAdapterIfAny)
? valueAdapterIfAny.getSpecification()
: objectMember.getElementType();