From cc1b8a2579e042f5cc156f18faefb6672739bf3f Mon Sep 17 00:00:00 2001 From: rjy7 Date: Wed, 16 Mar 2011 15:02:48 +0000 Subject: [PATCH] NIHVIVO-2216 Check that return value of getDataPropertyByURI() / getObjectPropertyByURI() is not null before adding to the list of properties returned by getDataPropertyList() / getObjectPropertyList(). --- .../mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java | 4 +++- .../mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java index 9806874b4..8c641c488 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java @@ -776,7 +776,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements Resource resource = sol.getResource("property"); String uri = resource.getURI(); DataProperty property = getDataPropertyByURI(uri); - properties.add(property); + if (property != null) { + properties.add(property); + } } return properties; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java index d52ac5cf7..7e2a9240f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/ObjectPropertyDaoJena.java @@ -894,7 +894,9 @@ public class ObjectPropertyDaoJena extends PropertyDaoJena implements ObjectProp String uri = resource.getURI(); log.debug("Found populated object property " + uri); ObjectProperty property = getObjectPropertyByURI(uri); - properties.add(property); + if (property != null) { + properties.add(property); + } } return properties; }