Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 29248 invoked from network); 9 Apr 2010 18:23:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 9 Apr 2010 18:23:28 -0000 Received: (qmail 29812 invoked by uid 500); 9 Apr 2010 18:23:28 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29751 invoked by uid 500); 9 Apr 2010 18:23:28 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 29744 invoked by uid 99); 9 Apr 2010 18:23:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Apr 2010 18:23:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 09 Apr 2010 18:23:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B296223888E8; Fri, 9 Apr 2010 18:23:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r932537 - /activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Date: Fri, 09 Apr 2010 18:23:04 -0000 To: commits@activemq.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100409182304.B296223888E8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chirino Date: Fri Apr 9 18:23:04 2010 New Revision: 932537 URL: http://svn.apache.org/viewvc?rev=932537&view=rev Log: related to https://issues.apache.org/activemq/browse/AMQ-2687 was using the wrong file var when reading some values from the recovery log. Net effect is that recovery log was always considered inconsistent. Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java?rev=932537&r1=932536&r2=932537&view=diff ============================================================================== --- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java (original) +++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java Fri Apr 9 18:23:04 2010 @@ -1073,9 +1073,9 @@ public class PageFile { // How many recovery pages do we have in the recovery buffer? recoveryFile.seek(0); - long nextTxId = readFile.readLong(); - long expectedChecksum = readFile.readLong(); - int pageCounter = readFile.readInt(); + long nextTxId = recoveryFile.readLong(); + long expectedChecksum = recoveryFile.readLong(); + int pageCounter = recoveryFile.readInt(); recoveryFile.seek(RECOVERY_FILE_HEADER_SIZE); Checksum checksum = new Adler32();