From aae6de1752843e1c5e5e03b15c4a2162554c066b Mon Sep 17 00:00:00 2001 From: jeb228 Date: Mon, 7 Feb 2011 16:40:57 +0000 Subject: [PATCH] Prevent the debug statement from throwing NullPointerException on a null individual. --- .../filters/HiddenFromDisplayBelowRoleLevelFilter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java index 7f961966f..a2c2f1b8a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java @@ -99,9 +99,11 @@ public class HiddenFromDisplayBelowRoleLevelFilter extends VitroFiltersImpl { private class IndividualRoleFilter extends UnaryFunctor{ @Override public Boolean fn(Individual ind){ + if( ind == null ) { + log.debug("checking hidden status for null Individual"); + return canViewOddItems(); + } log.debug("checking hidden status for Individual \"" + ind.getName() + "\""); - if( ind == null ) - return canViewOddItems(); try{ if( ! sameLevelOrHigher( ind.getHiddenFromDisplayBelowRoleLevel() ) )