You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2010/07/05 15:16:36 UTC

svn commit: r960590 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb: KahaDBStore.java MessageDatabase.java

Author: rajdavies
Date: Mon Jul  5 13:16:36 2010
New Revision: 960590

URL: http://svn.apache.org/viewvc?rev=960590&view=rev
Log:
remove unnecessary started flag

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java?rev=960590&r1=960589&r2=960590&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java Mon Jul  5 13:16:36 2010
@@ -863,7 +863,7 @@ public class KahaDBStore extends Message
     }
 
     public long size() {
-        if (!started.get()) {
+        if (!isStarted()) {
             return 0;
         }
         try {

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=960590&r1=960589&r2=960590&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 Jul  5 13:16:36 2010
@@ -90,9 +90,9 @@ public class MessageDatabase extends Ser
     private static final Log LOG = LogFactory.getLog(MessageDatabase.class);
     private static final int DEFAULT_DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
-    public static final int CLOSED_STATE = 1;
-    public static final int OPEN_STATE = 2;
-    private static final long NOT_ACKED = -1;
+     static final int CLOSED_STATE = 1;
+     static final int OPEN_STATE = 2;
+     static final long NOT_ACKED = -1;
 
 
     protected class Metadata {
@@ -170,7 +170,6 @@ public class MessageDatabase extends Ser
     boolean enableIndexWriteAsync = false;
     int setIndexWriteBatchSize = PageFile.DEFAULT_WRITE_BATCH_SIZE; 
     
-    protected AtomicBoolean started = new AtomicBoolean();
     protected AtomicBoolean opened = new AtomicBoolean();
     private LockFile lockFile;
     private boolean ignoreMissingJournalfiles = false;