From fd5b57551f0ce6ef9ea0ad4b6ae2f64afa51a306 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 13 Mar 2009 01:52:39 +0000
Subject: [PATCH] Merged V3.1 to HEAD    13424: ETHREEOH-1242: Sample LDAP
 authentication config breaks site invites in Share    13427: Fixes for
 ETHREEOH-1157: Propagate exceptions using ReportedException    13428: Fix
 ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and
 fixes_to_schema    13429: Specific fix for ETHREEOH-1157:
 duplicate/triplicate users not properly prohibited    13436: Merged V2.2 to
 V3.1       13435: Merged V2.1 to V2.2          12307: Merged DEV/V2.1SP7 to
 2.1             11927: ETWOONE-396             12112: ETWOONE-396    13437:
 Fixed ETHREEOH-1498: Mismatched closing XML tag in
 ehcache-custom.xml.sample.cluster    13439: Fix for ETHREEOH-1157: JSF
 Dialogs Absorbing Exceptions    13456: Fixed ETHREEOH-1472: Changes to
 systemBootstrap cause bootstrapping ACP's not to work    13469: Upgrade patch
 to update internal version2Store counter (follow-on fix for ETHREEOH-1540)   
 13491: Chaining example for DOC-84    13492: Fixed paths in zip file   
 13494: Fixed GenericBootstrapPatch when overriding bootstrap views    13495:
 Added @version javadoc    13496: Minor logging updates    13497: Fixed
 ETHREEOH-1431: Authentication case sensitivity switch doesn't work    13500:
 Temporary fix for Sharepoint issue raised last week    13502: ETHREEOH-1575:
 It's impossible to create Change Request task    13511: Fix for
 ETHREEOH-1549: Impossible to create HTML web content    13529: Fix for
 ETHREEOH-1595    13531: Fix for ETHREEOH-1607: Error on chaining example xml
 - malformed comment    13537: Build fix ... exclude the system user from auto
 creation    13538: Build Fix - further contraints to aviod auto-creation of
 guest    ___________________________________________________________________ 
   Modified: svn:mergeinfo       Merged /alfresco/BRANCHES/V2.1:r12307      
 Merged /alfresco/BRANCHES/V2.2:r13435       Merged /alfresco/BRANCHES/V3.1:r 
                  
 13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,           
        
 13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/webservice/AbstractQuerySession.java |  3 +--
 .../webservice/repository/RepositoryQuerySession.java  | 10 +++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/webservice/AbstractQuerySession.java b/source/java/org/alfresco/repo/webservice/AbstractQuerySession.java
index 4fe28eaff2..172dcc1aa3 100644
--- a/source/java/org/alfresco/repo/webservice/AbstractQuerySession.java
+++ b/source/java/org/alfresco/repo/webservice/AbstractQuerySession.java
@@ -155,8 +155,7 @@ public abstract class AbstractQuerySession<RESULTSET, RESULTSETROW> implements Q
         else if ((position + batchSize) >= allResultsSize)
         {
             // There isn't an excess of rows remaining, so copy to the last one
-            long lastResultIndex = allResultsSize - 1L;
-            long rowCopyCount = lastResultIndex - position + 1L;
+            long rowCopyCount = allResultsSize - position; //ETWOONE-396 second part
             batchedResults = makeArray((int)rowCopyCount);
             System.arraycopy(allResults, (int)position, batchedResults, 0, (int)rowCopyCount);
             // Position is after last
diff --git a/source/java/org/alfresco/repo/webservice/repository/RepositoryQuerySession.java b/source/java/org/alfresco/repo/webservice/repository/RepositoryQuerySession.java
index 67c99c6ce3..fe63841f2b 100644
--- a/source/java/org/alfresco/repo/webservice/repository/RepositoryQuerySession.java
+++ b/source/java/org/alfresco/repo/webservice/repository/RepositoryQuerySession.java
@@ -29,6 +29,8 @@ import org.alfresco.repo.webservice.ServerQuery;
 import org.alfresco.repo.webservice.types.ResultSet;
 import org.alfresco.repo.webservice.types.ResultSetRow;
 import org.alfresco.service.ServiceRegistry;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A query session for use with {@linkplain RepositoryWebService node-related queries} against the
@@ -41,6 +43,8 @@ public class RepositoryQuerySession extends AbstractQuerySession<ResultSet, Resu
 {
     private static final long serialVersionUID = -3621997639261137000L;
 
+    private static Log logger = LogFactory.getLog(RepositoryQuerySession.class);
+
     public RepositoryQuerySession(long maxResults, long batchSize, ServerQuery<ResultSet> query)
     {
         super(maxResults, batchSize, query);
@@ -52,6 +56,9 @@ public class RepositoryQuerySession extends AbstractQuerySession<ResultSet, Resu
         return new ResultSetRow[size];
     }
 
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.webservice.QuerySession#getNextResults(org.alfresco.service.ServiceRegistry)
+     */
     public ResultSet getNextResults(ServiceRegistry serviceRegistry)
     {
         ResultSet queryResults = getQueryResults(serviceRegistry);
@@ -61,7 +68,8 @@ public class RepositoryQuerySession extends AbstractQuerySession<ResultSet, Resu
         ResultSet batchedResults = new ResultSet();
         batchedResults.setMetaData(queryResults.getMetaData());
         batchedResults.setRows(batchedRows);
-        batchedResults.setTotalRowCount(batchedRows.length);
+        batchedResults.setTotalRowCount(allRows.length); 
+        logger.debug("total row count :"+allRows.length);
         // Done
         return batchedResults;
     }