From b3f8635fdd5d518e06bc548b6656a3f67d65b952 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 23 Sep 2015 13:18:46 +0000 Subject: [PATCH] Merged RM 2.3 to trunk RM 2.3.0.x 112691 abozianu: MNT-14728 : CLONE for HF - RM: Not all files are found when searching for a keyword using advanced search. - partial workaround (the elements can be scrolled down but the total result number is still wrong) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3.0.x@112697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../capability/RMAfterInvocationProvider.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 1b4d91b18c..437f1c4c08 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -412,8 +412,29 @@ public class RMAfterInvocationProvider extends RMSecurityCommon return null; } + class RMFilteringResultSet extends FilteringResultSet + { + private long numberFound; + + public RMFilteringResultSet(ResultSet unfiltered, BitSet inclusionMask) + { + super(unfiltered, inclusionMask); + } + + @Override + public long getNumberFound() + { + return numberFound; + } + + private void setNumberFound(long numberFound) + { + this.numberFound = numberFound; + } + } + BitSet inclusionMask = new BitSet(returnedObject.length()); - FilteringResultSet filteringResultSet = new FilteringResultSet(returnedObject, inclusionMask); + RMFilteringResultSet filteringResultSet = new RMFilteringResultSet(returnedObject, inclusionMask); List supportedDefinitions = extractSupportedDefinitions(config); @@ -524,6 +545,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon break; } } + + filteringResultSet.setNumberFound(returnedObject.getNumberFound()); + return filteringResultSet; }