[jboss-cvs] jboss-jms/src/main/org/jboss/messaging/core/plugin ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/19 12:21:23

  Modified:    src/main/org/jboss/messaging/core/plugin 
                        SimpleMessageReference.java
  Log:
  http://jira.jboss.com/jira/browse/JBMESSAGING-433
  
  Revision  Changes    Path
  1.7       +5 -27     jboss-jms/src/main/org/jboss/messaging/core/plugin/SimpleMessageReference.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SimpleMessageReference.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/plugin/SimpleMessageReference.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SimpleMessageReference.java	17 Jul 2006 17:14:48 -0000	1.6
  +++ SimpleMessageReference.java	19 Jul 2006 16:21:23 -0000	1.7
  @@ -132,7 +132,11 @@
      {
         if (released)
         {
  -         throw new IllegalStateException("Reference is already released");
  +         //Do nothing -
  +         //It's possible releaseMemoryReference can be called more than once on a reference since it's
  +         //allowable that acknowledge is called more than once for a delivery and each call will call this
  +         //method - so we don't want to throw an exception
  +         return;
         }
         holder.decrementInMemoryChannelCount();
         
  @@ -144,32 +148,6 @@
         return holder.getInMemoryChannelCount();
      }
     
  -   //These are all handled in RoutableSupport
  -   
  -//   public int getDeliveryCount()
  -//   {
  -//      return deliveryCount;
  -//   }
  -//   
  -//   public void incrementDeliveryCount()
  -//   {
  -//      deliveryCount++;      
  -//   }
  -//   
  -//   public void decrementDeliveryCount()
  -//   {
  -//      deliveryCount--;
  -//   }
  -//   
  -//   public void setDeliveryCount(int deliveryCount)
  -//   {
  -//      this.deliveryCount = deliveryCount;
  -//      if (deliveryCount > 0)
  -//      {
  -//         this.redelivered = true;
  -//      }
  -//   }
  -   
      public long getOrdering()
      {
         return ordering;