[jboss-cvs] JBoss Messaging SVN: r8459 - branches/Branch_1_4/src/main/org/jboss/messaging/core/impl.

[jboss-cvs-commits at lists.jboss.org]

Author: gaohoward
Date: 2011-10-26 05:06:37 -0400 (Wed, 26 Oct 2011)
New Revision: 8459

Modified:
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
   branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/PagingChannelSupport.java
Log:
JBMESSAGING-1906


Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2011-10-26 04:05:23 UTC (rev 8458)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2011-10-26 09:06:37 UTC (rev 8459)
@@ -486,12 +486,8 @@
     */
    public int getMessageCount()
    {
-      synchronized (lock)
-      {
-      	if (trace) { log.trace("Getting message count mr: "+  messageRefs.size() + " dc " + getDeliveringCount() + " sc " + getScheduledCount()); }
-
-         return messageRefs.size() + getDeliveringCount() + getScheduledCount();
-      }
+    	if (trace) { log.trace("Getting message count mr: "+  messageRefs.size() + " dc " + getDeliveringCount() + " sc " + getScheduledCount()); }
+      return messageRefs.size() + getDeliveringCount() + getScheduledCount();
    }
 
    public int getDeliveringCount()

Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/PagingChannelSupport.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/PagingChannelSupport.java	2011-10-26 04:05:23 UTC (rev 8458)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/PagingChannelSupport.java	2011-10-26 09:06:37 UTC (rev 8459)
@@ -148,12 +148,8 @@
       int count = super.getMessageCount();
       
       // Also need to add the paged refs
+      count += nextPagingOrder - firstPagingOrder;
       
-      synchronized (lock)
-      {      
-         count += nextPagingOrder - firstPagingOrder;
-      }
-      
       return count;
    }