[hornetq-commits] JBoss hornetq SVN: r11593 - branches/Branch_2_2_EAP/src/main/org/hornetq/ra.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2011-10-25 10:42:44 -0400 (Tue, 25 Oct 2011)
New Revision: 11593

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
Log:
regeister recovery at startup

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java	2011-10-25 13:09:53 UTC (rev 11592)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java	2011-10-25 14:42:44 UTC (rev 11593)
@@ -138,6 +138,11 @@
                                                      cm);
       }
 
+      if (connectionFactory == null)
+      {
+         connectionFactory = ra.createHornetQConnectionFactory(mcfProperties);
+         resourceRecovery = ra.getRecoveryManager().register(connectionFactory, null, null);
+      }
       return cf;
    }
 

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2011-10-25 13:09:53 UTC (rev 11592)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java	2011-10-25 14:42:44 UTC (rev 11593)
@@ -218,6 +218,18 @@
 
       this.ctx = ctx;
 
+      if (!configured.getAndSet(true))
+      {
+         try
+         {
+            setup();
+         }
+         catch (HornetQException e)
+         {
+            throw new ResourceAdapterInternalException("Unable to create activation", e);
+         }
+      }
+
       HornetQResourceAdapter.log.info("HornetQ resource adaptor started");
    }