svn commit: r802709 - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/store/kahadb/ kahadb/src/main/java/org/apache/kahadb/journal/

[gtully]

Author: gtully
Date: Mon Aug 10 09:51:08 2009
New Revision: 802709

URL: http://svn.apache.org/viewvc?rev=802709&view=rev
Log:
file size limit should be a long

Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
    activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
    activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java?rev=802709&r1=802708&r2=802709&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
 Mon Aug 10 09:51:08 2009
@@ -193,7 +193,7 @@
      * Get the journalMaxFileLength
      * @return the journalMaxFileLength
      */
-    public int getJournalMaxFileLength() {
+    public long getJournalMaxFileLength() {
         return this.letter.getJournalMaxFileLength();
     }
 
@@ -204,7 +204,7 @@
      * 
      * @org.apache.xbean.Property 
propertyEditor="org.apache.activemq.util.MemoryPropertyEditor"
      */
-    public void setJournalMaxFileLength(int journalMaxFileLength) {
+    public void setJournalMaxFileLength(long journalMaxFileLength) {
         this.letter.setJournalMaxFileLength(journalMaxFileLength);
     }
 

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=802709&r1=802708&r2=802709&view=diff
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 Mon Aug 10 09:51:08 2009
@@ -141,7 +141,7 @@
     protected boolean enableJournalDiskSyncs=true;
     long checkpointInterval = 5*1000;
     long cleanupInterval = 30*1000;
-    int journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
+    long journalMaxFileLength = Journal.DEFAULT_MAX_FILE_LENGTH;
     boolean enableIndexWriteAsync = false;
     int setIndexWriteBatchSize = PageFile.DEFAULT_WRITE_BATCH_SIZE; 
     
@@ -1396,11 +1396,11 @@
         this.cleanupInterval = cleanupInterval;
     }
 
-    public void setJournalMaxFileLength(int journalMaxFileLength) {
+    public void setJournalMaxFileLength(long journalMaxFileLength) {
         this.journalMaxFileLength = journalMaxFileLength;
     }
     
-    public int getJournalMaxFileLength() {
+    public long getJournalMaxFileLength() {
         return journalMaxFileLength;
     }
     

Modified: 
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java?rev=802709&r1=802708&r2=802709&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java 
(original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFile.java 
Mon Aug 10 09:51:08 2009
@@ -32,9 +32,9 @@
 
     protected final File file;
     protected final Integer dataFileId;
-    protected int length;
+    protected long length;
 
-    DataFile(File file, int number, int preferedSize) {
+    DataFile(File file, int number, long preferedSize) {
         this.file = file;
         this.dataFileId = Integer.valueOf(number);
         length = (int)(file.exists() ? file.length() : 0);
@@ -48,11 +48,11 @@
         return dataFileId;
     }
 
-    public synchronized int getLength() {
+    public synchronized long getLength() {
         return length;
     }
 
-    public void setLength(int length) {
+    public void setLength(long length) {
         this.length = length;
     }
 

Modified: 
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java?rev=802709&r1=802708&r2=802709&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java 
(original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/Journal.java 
Mon Aug 10 09:51:08 2009
@@ -80,8 +80,8 @@
     protected String fileSuffix = DEFAULT_FILE_SUFFIX;
     protected boolean started;
     
-    protected int maxFileLength = DEFAULT_MAX_FILE_LENGTH;
-    protected int preferedFileLength = DEFAULT_MAX_FILE_LENGTH - PREFERED_DIFF;
+    protected long maxFileLength = DEFAULT_MAX_FILE_LENGTH;
+    protected long preferedFileLength = DEFAULT_MAX_FILE_LENGTH - 
PREFERED_DIFF;
 
     protected DataFileAppender appender;
     protected DataFileAccessorPool accessorPool;
@@ -357,14 +357,14 @@
     /**
      * @return the maxFileLength
      */
-    public int getMaxFileLength() {
+    public long getMaxFileLength() {
         return maxFileLength;
     }
 
     /**
      * @param maxFileLength the maxFileLength to set
      */
-    public void setMaxFileLength(int maxFileLength) {
+    public void setMaxFileLength(long maxFileLength) {
         this.maxFileLength = maxFileLength;
     }