hibernate-commits

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction
In directory sc8-pr-cvs1:/tmp/cvs-serv6002/cirrus/hibernate/transaction

Modified Files:
	JTATransactionFactory.java 
Log Message:
use the default UserTransactionName defined on the TransactionManagerLookup

Index: JTATransactionFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/JTATransactionFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** JTATransactionFactory.java	27 Oct 2002 03:11:33 -0000	1.9
--- JTATransactionFactory.java	10 Dec 2002 13:13:28 -0000	1.10
***************
*** 36,41 ****
  	
  	public void configure(Properties props) throws HibernateException {
- 		utName = props.getProperty(Environment.USER_TRANSACTION);
- 		if (utName==null) utName = DEFAULT_USER_TRANSACTION_NAME;
  
  		try {
--- 36,39 ----
***************
*** 47,62 ****
  		}
  		
! 		String tmLookup = props.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
! 		if (tmLookup==null) {
! 			log.warn("No TransactionManagerLookup configured (use of JCS read-write cache is not recommended)");
  			transactionManager=null;
  		}
  		else {
  			
! 			log.info("Locating TransactionManager using: " + tmLookup);
  			
  			try {
! 				transactionManager = ( (TransactionManagerLookup) ReflectHelper.classForName(tmLookup).newInstance() )
! 					.getTransactionManager(props);
  				log.info("TransactionManager lookup successful");
  			}
--- 45,63 ----
  		}
  		
! 		utName = props.getProperty(Environment.USER_TRANSACTION);
! 
! 		String tmLookupClass = props.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
! 		if (tmLookupClass==null) {
! 			log.info("No TransactionManagerLookup configured (use of JCS read-write cache is not recommended)");
  			transactionManager=null;
  		}
  		else {
  			
! 			log.info("Locating TransactionManager using: " + tmLookupClass);
  			
  			try {
! 				TransactionManagerLookup tmlookup = (TransactionManagerLookup) ReflectHelper.classForName(tmLookupClass).newInstance();
! 				transactionManager = tmlookup.getTransactionManager(props);
! 				if (utname==null) utname = tmlookup.getUserTransactionName();
  				log.info("TransactionManager lookup successful");
  			}
***************
*** 70,73 ****
--- 71,76 ----
  		}
  			
+ 		if (utName==null) utName = DEFAULT_USER_TRANSACTION_NAME;
+ 
  	}