From 4f3e29890f2f6470f97f479015acf8998135de6d Mon Sep 17 00:00:00 2001 From: ryounes Date: Tue, 14 Jun 2011 19:36:22 +0000 Subject: [PATCH] NIHVIVO-2709 Fix code error to prevent error during variable dump --- .../webapp/web/templatemodels/VClassTemplateModel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java index 059d70d6a..676dbfe02 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassTemplateModel.java @@ -6,6 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; 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.Route; @@ -36,7 +37,8 @@ public class VClassTemplateModel extends BaseTemplateModel { return vclass.getEntityCount(); } - public VClassGroupTemplateModel getGroup(){ - return new VClassGroupTemplateModel(vclass.getGroup()); + public VClassGroupTemplateModel getGroup() { + VClassGroup group = vclass.getGroup(); + return (group == null) ? null : new VClassGroupTemplateModel(vclass.getGroup()); } }