[hornetq-commits] JBoss hornetq SVN: r9120 - trunk/src/main/org/hornetq/ra/inflow.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2010-04-15 05:27:44 -0400 (Thu, 15 Apr 2010)
New Revision: 9120

Modified:
   trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-362 - fixed the ra to cope with non transactional mdb's

Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java	2010-04-15 09:10:04 UTC (rev 9119)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java	2010-04-15 09:27:44 UTC (rev 9120)
@@ -246,8 +246,8 @@
          endpoint.beforeDelivery(HornetQActivation.ONMESSAGE);
          beforeDelivery = true;
          msg.doBeforeReceive();
+         ((MessageListener)endpoint).onMessage(msg);
          message.acknowledge();
-         ((MessageListener)endpoint).onMessage(msg);
          endpoint.afterDelivery();
          if (useLocalTx)
          {
@@ -269,7 +269,7 @@
                HornetQMessageHandler.log.warn("Unable to call after delivery");
             }
          }
-         if (useLocalTx)
+         if (useLocalTx || !activation.isDeliveryTransacted())
          {
             try
             {