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

NIHVIVO-2709 Fix code error to prevent error during variable dump

Browse source
This commit is contained in:
ryounes 2011-06-14 19:36:22 +00:00
parent 367d0bf9b4
commit 4f3e29890f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java
View file

@ -6,6 +6,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.beans.VClass;
import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
@ -36,7 +37,8 @@ public class VClassTemplateModel extends BaseTemplateModel {
return vclass.getEntityCount(); return vclass.getEntityCount();
} }
public VClassGroupTemplateModel getGroup(){ public VClassGroupTemplateModel getGroup() {
return new VClassGroupTemplateModel(vclass.getGroup()); VClassGroup group = vclass.getGroup();
return (group == null) ? null : new VClassGroupTemplateModel(vclass.getGroup());
} }
} }