User: mulder  
  Date: 00/07/03 17:11:14

  Modified:    src/main/org/jboss/minerva/factories
                        XAConnectionFactory.java
  Log:
  Close pools when jBoss is shut down.
  Fixes to transaction code.
  
  Revision  Changes    Path
  1.4       +5 -3      
jboss/src/main/org/jboss/minerva/factories/XAConnectionFactory.java
  
  Index: XAConnectionFactory.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/minerva/factories/XAConnectionFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XAConnectionFactory.java  2000/06/09 15:11:14     1.3
  +++ XAConnectionFactory.java  2000/07/04 00:11:14     1.4
  @@ -22,7 +22,7 @@
    * and any work done isn't associated with the java.sql.Connection anyway.
    * <P><B>Note:</B> This implementation requires that the TransactionManager
    * be bound to a JNDI name.</P>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * @author Aaron Mulder ([EMAIL PROTECTED])
    */
   public class XAConnectionFactory extends PoolObjectFactory {
  @@ -176,11 +176,13 @@
           try {
               TransactionManager tm = (TransactionManager)ctx.lookup(tmJndiName);
               if(tm.getStatus() != Status.STATUS_NO_TRANSACTION) {
  -                tm.getTransaction().enlistResource(con.getXAResource());
  +                Transaction trans = tm.getTransaction();
  +                trans.enlistResource(con.getXAResource());
                   con.addConnectionEventListener(listener);
                   if(log != null) log.println("Enlisted with transaction.");
  +            } else {
  +                if(log != null) log.println("No transaction right now.");
               }
  -            if(log != null) log.println("No transaction right now.");
           } catch(Exception e) {
               e.printStackTrace();
               throw new RuntimeException("Unable to register with TransactionManager: 
"+e);
  
  
  

Reply via email to