ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-3543 Update okhttp dependency (#5089)

Browse Source
This commit is contained in:
James Brown 2019-05-15 10:54:44 +01:00 committed by Shams Asari
parent 355604457f
commit ee3befcc6e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -34,7 +34,7 @@ buildscript {
ext.disruptor_version = constants.getProperty("disruptorVersion") ext.disruptor_version = constants.getProperty("disruptorVersion")
ext.metrics_version = constants.getProperty("metricsVersion") ext.metrics_version = constants.getProperty("metricsVersion")
ext.metrics_new_relic_version = constants.getProperty("metricsNewRelicVersion") ext.metrics_new_relic_version = constants.getProperty("metricsNewRelicVersion")
ext.okhttp_version = '3.5.0' ext.okhttp_version = '3.14.1'
ext.netty_version = '4.1.22.Final' ext.netty_version = '4.1.22.Final'
ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion") ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
ext.fileupload_version = '1.3.3' ext.fileupload_version = '1.3.3'

2
testing/node-driver/src/main/kotlin/net/corda/testing/node/internal/DriverDSLImpl.kt
View File

@ -307,7 +307,7 @@ class DriverDSLImpl(
while (process.isAlive) try { while (process.isAlive) try {
val response = client.newCall(Request.Builder().url(url).build()).execute() val response = client.newCall(Request.Builder().url(url).build()).execute()
if (response.isSuccessful && (response.body().string() == "started")) { if (response.isSuccessful && (response.body()?.string() == "started")) {
return WebserverHandle(handle.webAddress, process) return WebserverHandle(handle.webAddress, process)
} }
} catch (e: ConnectException) { } catch (e: ConnectException) {

2
testing/test-utils/src/main/kotlin/net/corda/testing/http/HttpUtils.kt
View File

@ -47,7 +47,7 @@ object HttpUtils {
private fun makeRequest(request: Request) { private fun makeRequest(request: Request) {
val response = client.newCall(request).execute() val response = client.newCall(request).execute()
if (!response.isSuccessful) { if (!response.isSuccessful) {
throw IOException("${request.method()} to ${request.url()} returned a ${response.code()}: ${response.body().string()}") throw IOException("${request.method()} to ${request.url()} returned a ${response.code()}: ${response.body()?.string()}")
} }
} }
} }