litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor modifications to avoid NPEs in property group property list handling

Browse source
This commit is contained in:
brianjlowe 2011-10-06 18:17:00 +00:00
parent 85d21c5c59
commit adf5558aa4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseIndividualTemplateModel.java
View file

@ -106,7 +106,7 @@ public abstract class BaseIndividualTemplateModel extends BaseTemplateModel {
} }
public GroupedPropertyList getPropertyList() { public GroupedPropertyList getPropertyList() {
if (propertyList == null) { if (!(propertyList instanceof GroupedPropertyList)) {
propertyList = new GroupedPropertyList(individual, vreq, policyHelper); propertyList = new GroupedPropertyList(individual, vreq, policyHelper);
} }
return propertyList; return propertyList;

4
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/GroupedPropertyList.java
View file

@ -337,7 +337,9 @@ public class GroupedPropertyList extends BaseTemplateModel {
// Clear out the property lists on the groups // Clear out the property lists on the groups
for (PropertyGroup pg : groupList) { for (PropertyGroup pg : groupList) {
if (pg.getPropertyList().size() > 0) { if (pg.getPropertyList() == null) {
pg.setPropertyList(new ArrayList<Property>());
} else if (pg.getPropertyList().size() > 0) {
pg.getPropertyList().clear(); pg.getPropertyList().clear();
} }
} }