Author: clebert.suconic(a)jboss.com Date: 2011-07-28 13:44:46 -0400 (Thu, 28 Jul 2011) New Revision: 11065 Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/QueueImpl.java Log: Improvement on queue Modified: branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-07-28 17:01:30 UTC (rev 11064) +++ branches/Branch_2_2_EAP_cluster_clean2/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-07-28 17:44:46 UTC (rev 11065) @@ -22,11 +22,13 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; @@ -726,9 +728,31 @@ public long getMessageCount() { - blockOnExecutorFuture(); + final CountDownLatch latch = new CountDownLatch(1); + final AtomicLong count = new AtomicLong(0); - return getInstantMessageCount(); + getExecutor().execute(new Runnable() + { + public void run() + { + count.set(getInstantMessageCount()); + latch.countDown(); + } + }); + + try + { + if (!latch.await(10, TimeUnit.SECONDS)) + { + throw new IllegalStateException("Timed out on waiting for MessageCount"); + } + } + catch (Exception e) + { + log.warn(e.getMessage(), e); + } + + return count.get(); } public long getInstantMessageCount()