Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 198DA781A for ; Tue, 4 Oct 2011 18:26:43 +0000 (UTC) Received: (qmail 24099 invoked by uid 500); 4 Oct 2011 18:26:43 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 24071 invoked by uid 500); 4 Oct 2011 18:26:43 -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 24064 invoked by uid 99); 4 Oct 2011 18:26:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2011 18:26:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2011 18:26:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DAFFA23888CD; Tue, 4 Oct 2011 18:26:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1178892 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Date: Tue, 04 Oct 2011 18:26:21 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111004182621.DAFFA23888CD@eris.apache.org> Author: jukka Date: Tue Oct 4 18:26:21 2011 New Revision: 1178892 URL: http://svn.apache.org/viewvc?rev=1178892&view=rev Log: JCR-3090: setFetchSize() fails in getAllNodeIds() Avoid problems when maxRows == 0 Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=1178892&r1=1178891&r2=1178892&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Tue Oct 4 18:26:21 2011 @@ -369,7 +369,11 @@ public class ConnectionHelper { stmt = con.prepareStatement(sql); } stmt.setMaxRows(maxRows); - stmt.setFetchSize(Math.min(10000, maxRows)); + int fetchSize = 10000; + if (0 < maxRows && maxRows < fetchSize) { + fetchSize = maxRows; // JCR-3090 + } + stmt.setFetchSize(fetchSize); execute(stmt, params); if (returnGeneratedKeys) { rs = stmt.getGeneratedKeys();