activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r932537 - /activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/PageFile.java
Date Fri, 09 Apr 2010 18:23:04 GMT
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();



Mime
View raw message