[Jboss-cvs] JBoss Messaging SVN: r1350 - in branches/Branch_1_0/src/main/org/jboss: jms/message messaging/core

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

Author: ovidiu.feodorov at jboss.com
Date: 2006-09-22 15:38:17 -0400 (Fri, 22 Sep 2006)
New Revision: 1350

Modified:
   branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java
   branches/Branch_1_0/src/main/org/jboss/messaging/core/ChannelSupport.java
Log:
fix for http://jira.jboss.org/jira/browse/JBMESSAGING-526

Modified: branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java	2006-09-22 19:38:10 UTC (rev 1349)
+++ branches/Branch_1_0/src/main/org/jboss/jms/message/MessageProxy.java	2006-09-22 19:38:17 UTC (rev 1350)
@@ -59,6 +59,10 @@
    
    // Static --------------------------------------------------------
 
+   protected static final int STATE_NEW = 0;
+   protected static final int STATE_SENT = 1;
+   protected static final int STATE_RECEIVED = 2;
+
    // Attributes ----------------------------------------------------
 
    protected JBossMessage message;
@@ -66,27 +70,16 @@
    protected transient SessionDelegate delegate;
    
    protected transient boolean cc;
-
    protected transient boolean messageCopied;
-
    protected transient boolean propertiesCopied;
-
    protected transient boolean bodyCopied;
 
    protected transient int state;
 
-   protected static final int STATE_NEW = 0;
-
-   protected static final int STATE_SENT = 1;
-
-   protected static final int STATE_RECEIVED = 2;
-
    protected transient boolean propertiesReadOnly;
-
    protected transient boolean bodyReadOnly;
 
    protected int deliveryCount;
-
    protected transient boolean jmsRedelivered;
 
    // Constructors --------------------------------------------------
@@ -407,7 +400,7 @@
 
       bodyReadOnly = true;
 
-      this.jmsRedelivered = deliveryCount > 0;
+      this.jmsRedelivered = deliveryCount > 1;
    }
 
    public JBossMessage getMessage()

Modified: branches/Branch_1_0/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-09-22 19:38:10 UTC (rev 1349)
+++ branches/Branch_1_0/src/main/org/jboss/messaging/core/ChannelSupport.java	2006-09-22 19:38:17 UTC (rev 1350)
@@ -1660,10 +1660,15 @@
    {
       Delivery d = null;
 
+      ref.incrementDeliveryCount();
+
       Set deliveries = router.handle(this, ref, null);
 
       if (deliveries.isEmpty())
       {
+         // unsucessful delivery attempt, nobody actually accepted the message, so decrement the
+         // delivery count
+         ref.decrementDeliveryCount();
          return null;
       }