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

Wait for complete disposal of Reactor Netty resources 

Fixes gh-23631
This commit is contained in:
Brian Clozel 2019-09-17 09:49:05 +02:00
parent b65984a078
commit ca2b2f5533
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/client/reactive/ReactorResourceFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2019 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -181,13 +181,13 @@ public class ReactorResourceFactory implements InitializingBean, DisposableBean
@Override @Override
public void destroy() { public void destroy() {
if (this.useGlobalResources) { if (this.useGlobalResources) {
HttpResources.disposeLoopsAndConnections(); HttpResources.disposeLoopsAndConnectionsLater().block();
} }
else { else {
try { try {
ConnectionProvider provider = this.connectionProvider; ConnectionProvider provider = this.connectionProvider;
if (provider != null && this.manageConnectionProvider) { if (provider != null && this.manageConnectionProvider) {
provider.dispose(); provider.disposeLater().block();
} }
} }
catch (Throwable ex) { catch (Throwable ex) {
@ -197,7 +197,7 @@ public class ReactorResourceFactory implements InitializingBean, DisposableBean
try { try {
LoopResources resources = this.loopResources; LoopResources resources = this.loopResources;
if (resources != null && this.manageLoopResources) { if (resources != null && this.manageLoopResources) {
resources.dispose(); resources.disposeLater().block();
} }
} }
catch (Throwable ex) { catch (Throwable ex) {

4
spring-web/src/test/java/org/springframework/http/client/reactive/ReactorResourceFactoryTests.java
View File

@ -107,8 +107,8 @@ public class ReactorResourceFactoryTests {
this.resourceFactory.destroy(); this.resourceFactory.destroy();
// Managed (destroy disposes).. // Managed (destroy disposes)..
verify(this.connectionProvider).dispose(); verify(this.connectionProvider).disposeLater();
verify(this.loopResources).dispose(); verify(this.loopResources).disposeLater();
verifyNoMoreInteractions(this.connectionProvider, this.loopResources); verifyNoMoreInteractions(this.connectionProvider, this.loopResources);
} }