Skip to content

Commit 11b1d2d

Browse files
committed
Merge branch '3.x'
2 parents ed9e4f1 + fc1f897 commit 11b1d2d

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,12 @@ public Mono<Void> trust(String host, int port) {
164164

165165
@Value.Derived
166166
Optional<ConnectionProvider> getConnectionProvider() {
167+
ConnectionProvider.Builder builder = ConnectionProvider.builder("cloudfoundry-client");
168+
167169
return Optional.ofNullable(getConnectionPoolSize())
168-
.map(connectionPoolSize -> ConnectionProvider.fixed("cloudfoundry-client", connectionPoolSize));
170+
.map(connectionPoolSize -> builder.maxConnections(connectionPoolSize)
171+
.pendingAcquireMaxCount(-1)
172+
.build());
169173
}
170174

171175
/**

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public Operator withErrorPayloadMapper(ErrorPayloadMapper errorPayloadMapper) {
9999
private static HttpClient attachRequestLogger(HttpClient httpClient) {
100100
RequestLogger requestLogger = new RequestLogger();
101101
return httpClient.doAfterRequest((request, connection) -> requestLogger.request(request))
102-
.doAfterResponse((response, connection) -> requestLogger.response(response));
102+
.doAfterResponseSuccess((response, connection) -> requestLogger.response(response))
103+
.doOnResponseError((response, connection) -> requestLogger.response(response));
103104
}
104105

105106
public static class PayloadConfiguration extends OperatorContextAware {

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959

6060
<properties>
6161
<commons-compress.version>1.20</commons-compress.version>
62-
<dependencies.version>2.2.4.RELEASE</dependencies.version>
62+
<dependencies.version>2.2.5.RELEASE</dependencies.version>
6363
<evo-inflector.version>1.2.2</evo-inflector.version>
6464
<immutables.version>2.8.3</immutables.version>
6565
<java-semver.version>0.9.0</java-semver.version>
6666
<jjwt.version>0.9.1</jjwt.version>
67-
<okhttp3.version>3.14.6</okhttp3.version>
67+
<okhttp3.version>3.14.7</okhttp3.version>
6868
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6969
<wire.version>2.2.0</wire.version>
7070
</properties>

0 commit comments

Comments
 (0)