diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
index 8a66c38d87..b690d90fb4 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
@@ -193,7 +193,7 @@ public class KahaDBPersistenceAdapter implements PersistenceAdapter {
      * Get the journalMaxFileLength
      * @return the journalMaxFileLength
      */
-    public long getJournalMaxFileLength() {
+    public int getJournalMaxFileLength() {
         return this.letter.getJournalMaxFileLength();
     }
 
@@ -204,7 +204,7 @@ public class KahaDBPersistenceAdapter implements PersistenceAdapter {
      * 
      * @org.apache.xbean.Property propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
-    public void setJournalMaxFileLength(long journalMaxFileLength) {
+    public void setJournalMaxFileLength(int journalMaxFileLength) {
         this.letter.setJournalMaxFileLength(journalMaxFileLength);
     }
 
diff --git a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 53a7788ae1..35b296cc88 100644
--- a/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -141,7 +141,7 @@ public class MessageDatabase {
     protected boolean enableJournalDiskSyncs=true;
     long checkpointInterval = 5*1000;
     long cleanupInterval = 30*1000;
-    long journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
+    int journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
     boolean enableIndexWriteAsync = false;
     int setIndexWriteBatchSize = PageFile.DEFAULT_WRITE_BATCH_SIZE; 
     
@@ -1396,11 +1396,11 @@ public class MessageDatabase {
         this.cleanupInterval = cleanupInterval;
     }
 
-    public void setJournalMaxFileLength(long journalMaxFileLength) {
+    public void setJournalMaxFileLength(int journalMaxFileLength) {
         this.journalMaxFileLength = journalMaxFileLength;
     }
     
-    public long getJournalMaxFileLength() {
+    public int getJournalMaxFileLength() {
         return journalMaxFileLength;
     }
     
diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java b/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
index 3ed65850d5..42c09c5f94 100644
--- a/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
+++ b/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
@@ -32,9 +32,9 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
 
     protected final File file;
     protected final Integer dataFileId;
-    protected long length;
+    protected int length;
 
-    DataFile(File file, int number, long preferedSize) {
+    DataFile(File file, int number, int preferedSize) {
         this.file = file;
         this.dataFileId = Integer.valueOf(number);
         length = (int)(file.exists() ? file.length() : 0);
@@ -48,11 +48,11 @@ public class DataFile extends LinkedNode<DataFile> implements Comparable<DataFil
         return dataFileId;
     }
 
-    public synchronized long getLength() {
+    public synchronized int getLength() {
         return length;
     }
 
-    public void setLength(long length) {
+    public void setLength(int length) {
         this.length = length;
     }
 
diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java b/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
index 897c1b2ad0..fba37555a2 100644
--- a/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
+++ b/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
@@ -80,8 +80,8 @@ public class Journal {
     protected String fileSuffix = DEFAULT_FILE_SUFFIX;
     protected boolean started;
     
-    protected long maxFileLength = DEFAULT_MAX_FILE_LENGTH;
-    protected long preferedFileLength = DEFAULT_MAX_FILE_LENGTH - PREFERED_DIFF;
+    protected int maxFileLength = DEFAULT_MAX_FILE_LENGTH;
+    protected int preferedFileLength = DEFAULT_MAX_FILE_LENGTH - PREFERED_DIFF;
 
     protected DataFileAppender appender;
     protected DataFileAccessorPool accessorPool;
@@ -357,14 +357,14 @@ public class Journal {
     /**
      * @return the maxFileLength
      */
-    public long getMaxFileLength() {
+    public int getMaxFileLength() {
         return maxFileLength;
     }
 
     /**
      * @param maxFileLength the maxFileLength to set
      */
-    public void setMaxFileLength(long maxFileLength) {
+    public void setMaxFileLength(int maxFileLength) {
         this.maxFileLength = maxFileLength;
     }
 
diff --git a/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java b/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
index eb694654f7..892742fc45 100644
--- a/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
+++ b/kahadb/src/main/java/org/apache/kahadb/journal/ReadOnlyDataFile.java
@@ -26,7 +26,7 @@ import java.io.RandomAccessFile;
  */
 public class ReadOnlyDataFile extends DataFile {
 
-    ReadOnlyDataFile(File file, int number, long preferedSize) {
+    ReadOnlyDataFile(File file, int number, int preferedSize) {
         super(file, number, preferedSize);
     }