[jboss-cvs] JBoss Messaging SVN: r8461 - in branches/Branch_1_4: src/main/org/jboss/jms/client/container and 1 other directory.

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

Author: gaohoward
Date: 2011-10-27 09:10:24 -0400 (Thu, 27 Oct 2011)
New Revision: 8461

Modified:
   branches/Branch_1_4/build-messaging.xml
   branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
Log:
JBMESSAGING-1907, and update version for sp5


Modified: branches/Branch_1_4/build-messaging.xml
===================================================================
--- branches/Branch_1_4/build-messaging.xml	2011-10-26 18:44:56 UTC (rev 8460)
+++ branches/Branch_1_4/build-messaging.xml	2011-10-27 13:10:24 UTC (rev 8461)
@@ -52,10 +52,10 @@
    <property name="messaging.version.major" value="1"/>
    <property name="messaging.version.minor" value="4"/>
    <property name="messaging.version.revision" value="8"/>
-   <property name="messaging.version.incrementing" value="50"/>
-   <property name="messaging.version.tag" value="SP4"/>
-   <property name="messaging.version.name" value="Kevard"/>
-   <property name="messaging.version.cvstag" value="JBossMessaging_1_4_8_SP4"/>
+   <property name="messaging.version.incrementing" value="51"/>
+   <property name="messaging.version.tag" value="SP5"/>
+   <property name="messaging.version.name" value="Kevardrek"/>
+   <property name="messaging.version.cvstag" value="JBossMessaging_1_4_8_SP5"/>
    <property name="module.name" value="messaging"/>
    <property name="module.Name" value="JBoss Messaging"/>
    <property name="module.version" value="${messaging.version.major}.${messaging.version.minor}.${messaging.version.revision}.${messaging.version.tag}"/>

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-10-26 18:44:56 UTC (rev 8460)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-10-27 13:10:24 UTC (rev 8461)
@@ -593,15 +593,18 @@
                if (!isConnectionConsumer && !ignore)
                {
                   final DeliveryInfo info = new DeliveryInfo(m, consumerID, queueName, null, shouldAck, m.getSource());
-                  sessionDelegate.preDeliver(info);
+                  ignore = ! sessionDelegate.preDeliver(info);
 
                   // If post deliver didn't succeed and acknowledgement mode is auto_ack
                   // That means the ref wasn't acked since it couldn't be found.
                   // In order to maintain at most once semantics we must therefore not return
                   // the message
-                  
-                  ignore = ! sessionDelegate.postDeliver();
 
+                  if (!ignore)
+                  {
+                     ignore = !sessionDelegate.postDeliver();
+                  }
+
                   if (trace)
                   {
                      log.trace("Post deliver returned " + !ignore);