root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2019-12-09 13:29:00 +01:00
parent 119dd04ae5
commit a4f75e9c6a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@ -1496,10 +1496,10 @@ public class ResolvableType implements Serializable {
@Override @Override
@Nullable @Nullable
public ResolvableType resolveVariable(TypeVariable<?> variable) { public ResolvableType resolveVariable(TypeVariable<?> variable) {
TypeVariable<?> v2 = SerializableTypeWrapper.unwrap(variable); TypeVariable<?> variableToCompare = SerializableTypeWrapper.unwrap(variable);
for (int i = 0; i < this.variables.length; i++) { for (int i = 0; i < this.variables.length; i++) {
TypeVariable<?> v1 = SerializableTypeWrapper.unwrap(this.variables[i]); TypeVariable<?> resolvedVariable = SerializableTypeWrapper.unwrap(this.variables[i]);
if (ObjectUtils.nullSafeEquals(v1, v2)) { if (ObjectUtils.nullSafeEquals(resolvedVariable, variableToCompare)) {
return this.generics[i]; return this.generics[i];
} }
} }

4
spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java
View File

@ -60,8 +60,8 @@ class ApplicationListenerMethodTransactionalAdapter extends ApplicationListenerM
@Override @Override
public void onApplicationEvent(ApplicationEvent event) { public void onApplicationEvent(ApplicationEvent event) {
if (TransactionSynchronizationManager.isSynchronizationActive() if (TransactionSynchronizationManager.isSynchronizationActive() &&
&& TransactionSynchronizationManager.isActualTransactionActive()) { TransactionSynchronizationManager.isActualTransactionActive()) {
TransactionSynchronization transactionSynchronization = createTransactionSynchronization(event); TransactionSynchronization transactionSynchronization = createTransactionSynchronization(event);
TransactionSynchronizationManager.registerSynchronization(transactionSynchronization); TransactionSynchronizationManager.registerSynchronization(transactionSynchronization);
} }