Browse Source

Polishing

pull/25232/head
Juergen Hoeller 6 years ago
parent
commit
9c1c787ee9
  1. 3
      spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java
  2. 5
      spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java

3
spring-orm/src/main/java/org/springframework/orm/hibernate5/HibernateTransactionManager.java

@ -310,6 +310,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana @@ -310,6 +310,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana
* <p>This enables convenient customizations for application purposes, e.g.
* setting Hibernate filters.
* @since 5.3
* @see Session#enableFilter
*/
public void setSessionInitializer(Consumer<Session> sessionInitializer) {
this.sessionInitializer = sessionInitializer;
@ -478,7 +479,7 @@ public class HibernateTransactionManager extends AbstractPlatformTransactionMana @@ -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");

5
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java

@ -57,8 +57,9 @@ final class DefaultWebClientBuilder implements WebClient.Builder { @@ -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);
}

Loading…
Cancel
Save