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

Fixing NPE in ClassGroupPageData when classgroup does not exist.

Browse source
This commit is contained in:
briancaruso 2012-05-11 19:45:12 +00:00
parent 7560e66cf8
commit a7fdf30a85
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
View file

@ -87,24 +87,23 @@ public class ClassGroupPageData extends DataGetterBase implements DataGetter{
break; break;
} }
} }
if( group == null ){
log.error("Cannot get classgroup '" + classGroupUri); setAllClassCountsToZero(group);
}else{
setAllClassCountsToZero(group); log.debug("Retrieved class group " + group.getURI()
+ " and returning to template");
if (log.isDebugEnabled()) {
List<VClass> groupClasses = group.getVitroClassList();
for (VClass v : groupClasses) {
log.debug("Class " + v.getName() + " - " + v.getURI()
+ " has " + v.getEntityCount() + " entities");
}
} }
}else{ }else{
log.error("classgroup " + classGroupUri + " does not exist in the system"); log.error("classgroup " + classGroupUri + " does not exist in the system");
} }
}
}
log.debug("Retrieved class group " + group.getURI() + " and returning to template");
//if debug enabled, print out the number of entities within each class in the class gorup
if(log.isDebugEnabled()){
List<VClass> groupClasses = group.getVitroClassList();
for(VClass v: groupClasses) {
log.debug("Class " + v.getName() + " - " + v.getURI() + " has " + v.getEntityCount() + " entities");
}
}
data.put("vClassGroup", group); //may put null data.put("vClassGroup", group); //may put null
//This page level data getters tries to set its own template, //This page level data getters tries to set its own template,