From commits-return-5201-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Feb 05 09:45:39 2008 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 27306 invoked from network); 5 Feb 2008 09:45:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Feb 2008 09:45:39 -0000 Received: (qmail 21279 invoked by uid 500); 5 Feb 2008 09:45:30 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 21256 invoked by uid 500); 5 Feb 2008 09:45:30 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 21231 invoked by uid 99); 5 Feb 2008 09:45:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2008 01:45:30 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2008 09:45:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EE2F41A983A; Tue, 5 Feb 2008 01:45:14 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r618589 - in /jackrabbit/branches/1.4/jackrabbit-core/src: main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java Date: Tue, 05 Feb 2008 09:45:11 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080205094514.EE2F41A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Feb 5 01:45:01 2008 New Revision: 618589 URL: http://svn.apache.org/viewvc?rev=618589&view=rev Log: 1.4: Merged revision 613221 (JCR-1323) Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java?rev=618589&r1=618588&r2=618589&view=diff ============================================================================== --- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java (original) +++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java Tue Feb 5 01:45:01 2008 @@ -411,11 +411,11 @@ * nodes or the session does not have access to a node. */ public long getSize() { - int totalSize = getTotalSize(); - if (limit > 0 && totalSize > limit) { + long size = getTotalSize() - offset; + if (limit > 0 && size > limit) { return limit; } else { - return totalSize - offset; + return size; } } Modified: jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java?rev=618589&r1=618588&r2=618589&view=diff ============================================================================== --- jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java (original) +++ jackrabbit/branches/1.4/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java Tue Feb 5 01:45:01 2008 @@ -63,6 +63,10 @@ return (QueryImpl) queryManager.createQuery(xpath, Query.XPATH); } + protected void checkResult(QueryResult result, Node[] expectedNodes) throws RepositoryException { + assertEquals(expectedNodes.length, result.getNodes().getSize()); + } + public void testLimit() throws Exception { query.setLimit(1); QueryResult result = query.execute(); @@ -111,6 +115,12 @@ query.setLimit(2); result = query.execute(); checkResult(result, new Node[] { node1, node2 }); + + // Added for JCR-1323 + query.setOffset(0); + query.setLimit(4); + result = query.execute(); + checkResult(result, new Node[] { node1, node2, node3 }); } public void testOffsetAndSkip() throws Exception {