From 9c1c787ee953268c46c58f36553f38cc44caaf5d Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 8 Jun 2020 19:27:38 +0200 Subject: [PATCH] Polishing --- .../orm/hibernate5/HibernateTransactionManager.java | 3 ++- .../reactive/function/client/DefaultWebClientBuilder.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java index b7619fad9b6..e34eeab30c5 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java @@ -310,6 +310,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana *

This enables convenient customizations for application purposes, e.g. * setting Hibernate filters. * @since 5.3 + * @see Session#enableFilter */ public void setSessionInitializer(Consumer sessionInitializer) { this.sessionInitializer = sessionInitializer; @@ -478,7 +479,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana obtainSessionFactory().withOptions().interceptor(entityInterceptor).openSession() : obtainSessionFactory().openSession()); if (this.sessionInitializer != null) { - this.sessionInitializer.accept(session); + this.sessionInitializer.accept(newSession); } if (logger.isDebugEnabled()) { logger.debug("Opened new Session [" + newSession + "] for Hibernate transaction"); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java index 965fbc1a294..ed51fb90916 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java @@ -57,8 +57,9 @@ final class DefaultWebClientBuilder implements WebClient.Builder { ClassLoader loader = DefaultWebClientBuilder.class.getClassLoader(); reactorClientPresent = ClassUtils.isPresent("reactor.netty.http.client.HttpClient", loader); jettyClientPresent = ClassUtils.isPresent("org.eclipse.jetty.client.HttpClient", loader); - httpComponentsClientPresent = ClassUtils.isPresent("org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient", loader) - && ClassUtils.isPresent("org.apache.hc.core5.reactive.ReactiveDataConsumer", loader); + httpComponentsClientPresent = + ClassUtils.isPresent("org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient", loader) && + ClassUtils.isPresent("org.apache.hc.core5.reactive.ReactiveDataConsumer", loader); }