From commits-return-13349-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon May 21 11:38:36 2012 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 8F244C2E2 for ; Mon, 21 May 2012 11:38:36 +0000 (UTC) Received: (qmail 28111 invoked by uid 500); 21 May 2012 11:38:36 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 27916 invoked by uid 500); 21 May 2012 11:38:32 -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 27873 invoked by uid 99); 21 May 2012 11:38:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 May 2012 11:38:30 +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; Mon, 21 May 2012 11:38:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 50AA423889B3; Mon, 21 May 2012 11:38:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1340974 - /jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java Date: Mon, 21 May 2012 11:38:07 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120521113807.50AA423889B3@eris.apache.org> Author: alexparvulescu Date: Mon May 21 11:38:06 2012 New Revision: 1340974 URL: http://svn.apache.org/viewvc?rev=1340974&view=rev Log: JCR-3234 QueryStat getPopularQueries doesn't set the proper position (ported to 2.4) Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java?rev=1340974&r1=1340973&r2=1340974&view=diff ============================================================================== --- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java (original) +++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/stats/QueryStatImpl.java Mon May 21 11:38:06 2012 @@ -158,10 +158,10 @@ public class QueryStatImpl implements Qu int retSize = Math.min(size, maxSize / POPULAR_QUEUE_MULTIPLIER); QueryStatDto[] retval = new QueryStatDto[retSize]; for (int i = 0; i < retSize; i++) { - top[i].setPosition(i + 1); retval[i] = top[i]; + retval[i].setPosition(i + 1); } - return top; + return retval; } public int getPopularQueriesQueueSize() {