From 76fc86abc4b8ddcfdc2a8f8e65756088495ac3ca Mon Sep 17 00:00:00 2001 From: ryounes Date: Fri, 24 Jun 2011 19:26:51 +0000 Subject: [PATCH] NIHVIVO-2767 Fix loop variable test in SolrPagedSearchController.getClassGroups(), so no error is generated if fewer results returned than the maxHitCount. --- .../webapp/search/controller/SolrPagedSearchController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java index be369611d..0edec263f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/SolrPagedSearchController.java @@ -347,9 +347,9 @@ public class SolrPagedSearchController extends FreemarkerHttpServlet { HashSet classGroupsInHits = new HashSet(n); int grpsFound = 0; - for(int i = 0; i < maxHitCount && n > grpsFound ;i++){ + long maxHits = Math.min(docs.getNumFound(), maxHitCount); + for(int i = 0; i < maxHits && n > grpsFound ;i++){ try{ - //log.debug("Looking for classgroups from document number " + i); SolrDocument doc = docs.get(i); Collection grps = doc.getFieldValues(VitroTermNames.CLASSGROUP_URI); if (grps != null) {