[jboss-cvs] jboss-jms/src/main/org/jboss/jms/message ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/17 13:14:45

  Modified:    src/main/org/jboss/jms/message   JBossBytesMessage.java
                        MessageProxy.java
  Log:
  Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
  
  Revision  Changes    Path
  1.29      +2 -3      jboss-jms/src/main/org/jboss/jms/message/JBossBytesMessage.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossBytesMessage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/message/JBossBytesMessage.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- JBossBytesMessage.java	19 Jun 2006 15:16:07 -0000	1.28
  +++ JBossBytesMessage.java	17 Jul 2006 17:14:45 -0000	1.29
  @@ -39,7 +39,6 @@
   
   import org.jboss.jms.destination.JBossDestination;
   import org.jboss.jms.util.MessagingJMSException;
  -import org.jboss.jms.util.SafeUTF;
   import org.jboss.logging.Logger;
   
   /**
  @@ -50,9 +49,9 @@
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    * 
  - * @version $Revision: 1.28 $
  + * @version $Revision: 1.29 $
    *
  - * $Id: JBossBytesMessage.java,v 1.28 2006/06/19 15:16:07 timfox Exp $
  + * $Id: JBossBytesMessage.java,v 1.29 2006/07/17 17:14:45 timfox Exp $
    */
   public class JBossBytesMessage extends JBossMessage implements BytesMessage, Externalizable
   {
  
  
  
  1.4       +19 -5     jboss-jms/src/main/org/jboss/jms/message/MessageProxy.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MessageProxy.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/message/MessageProxy.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- MessageProxy.java	27 Apr 2006 17:38:09 -0000	1.3
  +++ MessageProxy.java	17 Jul 2006 17:14:45 -0000	1.4
  @@ -65,6 +65,8 @@
   
      protected transient SessionDelegate delegate;
   
  +   protected transient boolean cc;
  +
      protected transient boolean messageCopied;
   
      protected transient boolean propertiesCopied;
  @@ -364,9 +366,10 @@
   
      public void acknowledge() throws JMSException
      {
  -      if (delegate != null)
  +      if (!cc)
         {
  -         delegate.acknowledge();
  +         //Only acknowledge for client ack if is not in connection consumer
  +         delegate.acknowledgeAll();
         }
      }
   
  @@ -380,9 +383,15 @@
   
      // Public --------------------------------------------------------
   
  -   public void setSessionDelegate(SessionDelegate sd)
  +   public void setSessionDelegate(SessionDelegate sd, boolean isConnectionConsumer)
      {
         this.delegate = sd;
  +      this.cc = isConnectionConsumer;
  +   }
  +   
  +   public SessionDelegate getSessionDelegate()
  +   {
  +      return delegate;
      }
   
      public void setSent()
  @@ -411,6 +420,11 @@
         return deliveryCount;
      }
   
  +   public void incDeliveryCount()
  +   {
  +      this.deliveryCount++;
  +   }
  +
      public String toString()
      {
         return "delegator->" + message;
  @@ -439,7 +453,7 @@
         }
      }
   
  -   protected boolean isSent()
  +   public boolean isSent()
      {
         return state == STATE_SENT;
      }