[hornetq-commits] JBoss hornetq SVN: r8217 - trunk/src/main/org/hornetq/core/server/impl.

[do-not-reply at jboss.org]

Author: timfox
Date: 2009-11-05 02:25:01 -0500 (Thu, 05 Nov 2009)
New Revision: 8217

Modified:
   trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
Log:
removed unnecessary volatile modifiers that clebert added

Modified: trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java	2009-11-04 23:36:19 UTC (rev 8216)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java	2009-11-05 07:25:01 UTC (rev 8217)
@@ -94,7 +94,8 @@
 
    private volatile LargeMessageDeliverer largeMessageDeliverer = null;
 
-   private volatile boolean largeMessageInDelivery;
+   // Note, this does not need to be volatile since it is only accessed when the lock is held
+   private boolean largeMessageInDelivery;
 
    /**
     * if we are a browse only consumer we don't need to worry about acknowledgemenets or being started/stopeed by the session.
@@ -349,6 +350,7 @@
             forcedDeliveryMessage.setDestination(messageQueue.getName());
 
             final SessionReceiveMessage packet = new SessionReceiveMessage(id, forcedDeliveryMessage, 0);
+            
             channel.send(packet);
          }
       });
@@ -622,8 +624,10 @@
    {
       private final long sizePendingLargeMessage;
 
-      /** The current message being processed */
-      private volatile LargeServerMessage largeMessage;
+      /** The current message being processed
+       *  Note, this does not need to be volatile since it is only accessed when the lock is held
+       */
+      private LargeServerMessage largeMessage;
 
       private final MessageReference ref;