|
|
|
@ -547,8 +547,8 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager |
|
|
|
* @return a corresponding UserTransaction handle |
|
|
|
* @return a corresponding UserTransaction handle |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
protected UserTransaction buildUserTransaction(TransactionManager transactionManager) { |
|
|
|
protected UserTransaction buildUserTransaction(TransactionManager transactionManager) { |
|
|
|
if (transactionManager instanceof UserTransaction userTransaction) { |
|
|
|
if (transactionManager instanceof UserTransaction ut) { |
|
|
|
return userTransaction; |
|
|
|
return ut; |
|
|
|
} |
|
|
|
} |
|
|
|
else { |
|
|
|
else { |
|
|
|
return new UserTransactionAdapter(transactionManager); |
|
|
|
return new UserTransactionAdapter(transactionManager); |
|
|
|
@ -702,11 +702,11 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
@Nullable |
|
|
|
@Nullable |
|
|
|
protected TransactionManager findTransactionManager(@Nullable UserTransaction ut) { |
|
|
|
protected TransactionManager findTransactionManager(@Nullable UserTransaction ut) { |
|
|
|
if (ut instanceof TransactionManager transactionManager) { |
|
|
|
if (ut instanceof TransactionManager tm) { |
|
|
|
if (logger.isDebugEnabled()) { |
|
|
|
if (logger.isDebugEnabled()) { |
|
|
|
logger.debug("JTA UserTransaction object [" + ut + "] implements TransactionManager"); |
|
|
|
logger.debug("JTA UserTransaction object [" + ut + "] implements TransactionManager"); |
|
|
|
} |
|
|
|
} |
|
|
|
return transactionManager; |
|
|
|
return tm; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Check fallback JNDI locations.
|
|
|
|
// Check fallback JNDI locations.
|
|
|
|
|