Handling inlined properties that happen to be null- (#230)

Signed-off-by: Jad El-khoury <jad.el.khoury@scania.com>
eclipse · Dec 22, 2021 · 3efaf45 · 3efaf45
1 parent 3ee65db
commit 3efaf45
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/oslc-ui-model/src/main/java/org/eclipse/lyo/server/ui/model/PreviewFactory.java b/server/oslc-ui-model/src/main/java/org/eclipse/lyo/server/ui/model/PreviewFactory.java
@@ -76,12 +76,12 @@ public static Preview getPreview(final AbstractResource aResource, List<String>
                         Collection<AbstractResource> rs = (Collection<AbstractResource>) getterMethod.invoke(aResource);
                         List<org.eclipse.lyo.server.ui.model.Link> l = new ArrayList<>();
                         for (AbstractResource r: rs) {
-                            l.add(constructLink(r.getAbout().toString(), r.toString()));
+                            l.add((null == r ? null : constructLink(r.getAbout().toString(), r.toString())));
                         }
                         value = constructPropertyValue(PropertyDefintion.RepresentationType.LINK, multiple, l);
                     } else {
                     	AbstractResource r = (AbstractResource) getterMethod.invoke(aResource);
-                        value = constructPropertyValue(PropertyDefintion.RepresentationType.LINK, multiple, constructLink(r.getAbout().toString(), r.toString()));
+                        value = constructPropertyValue(PropertyDefintion.RepresentationType.LINK, multiple, (null == r ? null : constructLink(r.getAbout().toString(), r.toString())));
                     }
             	}
             	else {