[jboss-cvs] JBoss Messaging SVN: r5841 - trunk/src/main/org/jboss/messaging/ra/inflow.

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

Author: jesper.pedersen
Date: 2009-02-09 14:20:19 -0500 (Mon, 09 Feb 2009)
New Revision: 5841

Modified:
   trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java
   trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandlerPool.java
Log:
[JBMESSAGING-1367] Create JCA resource adapter for JBM 2.0

Modified: trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java	2009-02-09 18:58:14 UTC (rev 5840)
+++ trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandler.java	2009-02-09 19:20:19 UTC (rev 5841)
@@ -153,6 +153,9 @@
       
       endpoint = endpointFactory.createEndpoint(xaResource);
 
+      // Create the transaction demarcation strategy
+      txnStrategy = createTransactionDemarcation();
+
       // Set the message listener
       messageConsumer.setMessageListener(this);
    }
@@ -207,16 +210,6 @@
       
       try
       {
-         txnStrategy = createTransactionDemarcation();
-      } 
-      catch (Throwable t)
-      {
-         log.error("Error creating transaction demarcation. Cannot continue.");
-         return;
-      }
-
-      try
-      {
          endpoint.beforeDelivery(JBMActivation.ONMESSAGE);
 
          try

Modified: trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandlerPool.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandlerPool.java	2009-02-09 18:58:14 UTC (rev 5840)
+++ trunk/src/main/org/jboss/messaging/ra/inflow/JBMMessageHandlerPool.java	2009-02-09 19:20:19 UTC (rev 5841)
@@ -114,6 +114,7 @@
 
       synchronized (activeSessions)
       {
+         handler.teardown();
          activeSessions.remove(handler);
          
          if (!stopped.get())