[rhmessaging-commits] rhmessaging commits: r2853 - store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb.

[rhmessaging-commits at lists.jboss.org]

Author: aidanskinner
Date: 2008-11-20 10:44:42 -0500 (Thu, 20 Nov 2008)
New Revision: 2853

Modified:
   store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
RHM-7: Remove hasUpdates, ensure that we can't wait on a lock and have it not be notified after.

Modified: store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2008-11-19 23:30:45 UTC (rev 2852)
+++ store/branches/java/broker-queue-refactor/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java	2008-11-20 15:44:42 UTC (rev 2853)
@@ -1835,7 +1835,6 @@
         private final AtomicReference<Queue<Commit>> _jobQueue = new AtomicReference<Queue<Commit>>(new ConcurrentLinkedQueue<Commit>());
         private final CheckpointConfig _config = new CheckpointConfig();
         private final Object _lock = new Object();
-        private AtomicBoolean _hasJobs = new AtomicBoolean(false);
 
         public CommitThread(String name)
         {
@@ -1884,15 +1883,6 @@
                 {
                     commit.complete();
                 }
-                if (_jobQueue.get().isEmpty())
-                {
-                    _hasJobs.set(false);
-                    if (!_jobQueue.get().isEmpty())
-                    {
-                        _hasJobs.set(true);
-                    }
-                }
-
             }
             catch (DatabaseException e)
             {
@@ -1912,12 +1902,9 @@
         public void addJob(Commit commit)
         {
             _jobQueue.get().add(commit);
-            if (_hasJobs.compareAndSet(false, true))
+            synchronized (_lock)
             {
-                synchronized (_lock)
-                {
-                    _lock.notifyAll();
-                }
+                _lock.notifyAll();
             }
         }