From adf5558aa4dc9ca1dc70389947f551d542180671 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Thu, 6 Oct 2011 18:17:00 +0000 Subject: [PATCH] minor modifications to avoid NPEs in property group property list handling --- .../individual/BaseIndividualTemplateModel.java | 2 +- .../web/templatemodels/individual/GroupedPropertyList.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java index 657820fd7..9dff23ac8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java @@ -106,7 +106,7 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel { } public GroupedPropertyList getPropertyList() { - if (propertyList == null) { + if (!(propertyList instanceof GroupedPropertyList)) { propertyList = new GroupedPropertyList(individual, vreq, policyHelper); } return propertyList; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java index 083a6fbf7..cf007f043 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java @@ -337,7 +337,9 @@ public class GroupedPropertyList extends BaseTemplateModel { // Clear out the property lists on the groups for (PropertyGroup pg : groupList) { - if (pg.getPropertyList().size() > 0) { + if (pg.getPropertyList() == null) { + pg.setPropertyList(new ArrayList()); + } else if (pg.getPropertyList().size() > 0) { pg.getPropertyList().clear(); } }