[Jboss-cvs] JBoss Messaging SVN: r1198 - trunk/src/main/org/jboss/jms/server/endpoint

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-08-05 00:47:55 -0400 (Sat, 05 Aug 2006)
New Revision: 1198

Modified:
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-490

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-08-05 02:29:26 UTC (rev 1197)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2006-08-05 04:47:55 UTC (rev 1198)
@@ -107,13 +107,13 @@
    // Must be volatile
    private volatile boolean bufferFull;
    
+   // Must be volatile
+   private volatile boolean started;
+   
    // No need to be volatile - is protected by lock
-   private boolean started;
-   
-   //No need to be volatile - is protected by lock
    private boolean closed;
    
-   //No need to be volatile
+   // No need to be volatile
    private boolean disconnected;
    
    private Executor executor;
@@ -204,7 +204,7 @@
     */
    public Delivery handle(DeliveryObserver observer, Routable reference, Transaction tx)
    {
-      if (trace) { log.trace(this + " receives reference " + reference + " for delivery"); }
+      if (trace) { log.trace(this + " receives " + reference + " for delivery"); }
       
       // This is ok to have outside lock - is volatile
       if (bufferFull)
@@ -338,9 +338,10 @@
       {
          synchronized (lock)
          { 
-            //On close we only disconnect the consumer from the Channel we don't actually remove it
-            // This is because it may still contain deliveries that may well be acknowledged after
-            // the consumer has closed. This is perfectly valid.      
+            // On close we only disconnect the consumer from the Channel we don't actually remove
+            // it. This is because it may still contain deliveries that may well be acknowledged
+            // after the consumer has closed. This is perfectly valid.
+
             //FIXME - The deliveries should really be stored in the session endpoint, not here
             //that is their natural place, that would mean we wouldn't have to mess around with keeping
             //deliveries after this is closed
@@ -734,7 +735,7 @@
 
             try
             {
-               if (trace) { log.trace("handing " + list.size() + " messages over to the remoting layer"); }
+               if (trace) { log.trace("handing " + list.size() + " message(s) over to the remoting layer"); }
             
                ClientDelivery del = new ClientDelivery(list, id);