https://jira.jboss.org/jira/browse/HORNETQ-362 - fixed the ra to cope…

… with non transactional mdb's
hornetq · Apr 15, 2010 · e3b6f98 · e3b6f98
1 parent d0dc455
commit e3b6f98
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java b/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
@@ -246,8 +246,8 @@ public void onMessage(final ClientMessage message)
          endpoint.beforeDelivery(HornetQActivation.ONMESSAGE);
          beforeDelivery = true;
          msg.doBeforeReceive();
-         message.acknowledge();
          ((MessageListener)endpoint).onMessage(msg);
+         message.acknowledge();
          endpoint.afterDelivery();
          if (useLocalTx)
          {
@@ -269,7 +269,7 @@ public void onMessage(final ClientMessage message)
                HornetQMessageHandler.log.warn("Unable to call after delivery");
             }
          }
-         if (useLocalTx)
+         if (useLocalTx || !activation.isDeliveryTransacted())
          {
             try
             {