From 34e5ce9360ed6c0fe83678a904d5e70064765db6 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 28 Feb 2023 16:03:08 +0100 Subject: [PATCH] Fix Checkstyle violations See gh-30019 --- .../transaction/jta/JtaTransactionManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java index 233bdd83db6..674b23af75a 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/jta/JtaTransactionManager.java @@ -547,8 +547,8 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager * @return a corresponding UserTransaction handle */ protected UserTransaction buildUserTransaction(TransactionManager transactionManager) { - if (transactionManager instanceof UserTransaction userTransaction) { - return userTransaction; + if (transactionManager instanceof UserTransaction ut) { + return ut; } else { return new UserTransactionAdapter(transactionManager); @@ -702,11 +702,11 @@ public class JtaTransactionManager extends AbstractPlatformTransactionManager */ @Nullable protected TransactionManager findTransactionManager(@Nullable UserTransaction ut) { - if (ut instanceof TransactionManager transactionManager) { + if (ut instanceof TransactionManager tm) { if (logger.isDebugEnabled()) { logger.debug("JTA UserTransaction object [" + ut + "] implements TransactionManager"); } - return transactionManager; + return tm; } // Check fallback JNDI locations.