From a4f75e9c6a04b81925a617f6547e10fac1eba0a6 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 9 Dec 2019 13:29:00 +0100 Subject: [PATCH] Polishing --- .../main/java/org/springframework/core/ResolvableType.java | 6 +++--- .../ApplicationListenerMethodTransactionalAdapter.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/ResolvableType.java b/spring-core/src/main/java/org/springframework/core/ResolvableType.java index e17d5095774..890ca5d747d 100644 --- a/spring-core/src/main/java/org/springframework/core/ResolvableType.java +++ b/spring-core/src/main/java/org/springframework/core/ResolvableType.java @@ -1496,10 +1496,10 @@ public class ResolvableType implements Serializable { @Override @Nullable public ResolvableType resolveVariable(TypeVariable variable) { - TypeVariable v2 = SerializableTypeWrapper.unwrap(variable); + TypeVariable variableToCompare = SerializableTypeWrapper.unwrap(variable); for (int i = 0; i < this.variables.length; i++) { - TypeVariable v1 = SerializableTypeWrapper.unwrap(this.variables[i]); - if (ObjectUtils.nullSafeEquals(v1, v2)) { + TypeVariable resolvedVariable = SerializableTypeWrapper.unwrap(this.variables[i]); + if (ObjectUtils.nullSafeEquals(resolvedVariable, variableToCompare)) { return this.generics[i]; } } diff --git a/spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java b/spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java index a4f32cca962..b39e8c35204 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java +++ b/spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java @@ -60,8 +60,8 @@ class ApplicationListenerMethodTransactionalAdapter extends ApplicationListenerM @Override public void onApplicationEvent(ApplicationEvent event) { - if (TransactionSynchronizationManager.isSynchronizationActive() - && TransactionSynchronizationManager.isActualTransactionActive()) { + if (TransactionSynchronizationManager.isSynchronizationActive() && + TransactionSynchronizationManager.isActualTransactionActive()) { TransactionSynchronization transactionSynchronization = createTransactionSynchronization(event); TransactionSynchronizationManager.registerSynchronization(transactionSynchronization); }