ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-14 00:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-3675: Update netty for security (#6109)

Browse Source 
* CORDA-3675: Update netty for security

* Try to improve thread counting in tests
This commit is contained in:
Ryan Fowler 2020-03-31 10:22:10 +01:00 committed by GitHub
parent ccca605865
commit 82a3f69f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -79,8 +79,8 @@ buildscript {
ext.djvm_version = constants.getProperty("djvmVersion") ext.djvm_version = constants.getProperty("djvmVersion")
ext.deterministic_rt_version = constants.getProperty('deterministicRtVersion') ext.deterministic_rt_version = constants.getProperty('deterministicRtVersion')
ext.okhttp_version = '3.14.2' ext.okhttp_version = '3.14.2'
ext.netty_version = '4.1.29.Final' ext.netty_version = '4.1.46.Final'
ext.tcnative_version = '2.0.14.Final' ext.tcnative_version = '2.0.29.Final'
ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion") ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
ext.fileupload_version = '1.4' ext.fileupload_version = '1.4'
ext.kryo_version = '4.0.2' ext.kryo_version = '4.0.2'

4
client/rpc/src/integration-test/kotlin/net/corda/client/rpc/RPCStabilityTests.kt
View File

@ -14,13 +14,13 @@ import net.corda.core.utilities.Try
import net.corda.core.utilities.getOrThrow import net.corda.core.utilities.getOrThrow
import net.corda.core.utilities.millis import net.corda.core.utilities.millis
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.coretesting.internal.testThreadFactory
import net.corda.node.services.rpc.RPCServerConfiguration import net.corda.node.services.rpc.RPCServerConfiguration
import net.corda.nodeapi.RPCApi import net.corda.nodeapi.RPCApi
import net.corda.testing.common.internal.eventually import net.corda.testing.common.internal.eventually
import net.corda.testing.common.internal.succeeds import net.corda.testing.common.internal.succeeds
import net.corda.testing.core.SerializationEnvironmentRule import net.corda.testing.core.SerializationEnvironmentRule
import net.corda.testing.driver.internal.incrementalPortAllocation import net.corda.testing.driver.internal.incrementalPortAllocation
import net.corda.coretesting.internal.testThreadFactory
import net.corda.testing.node.internal.RPCDriverDSL import net.corda.testing.node.internal.RPCDriverDSL
import net.corda.testing.node.internal.RpcBrokerHandle import net.corda.testing.node.internal.RpcBrokerHandle
import net.corda.testing.node.internal.RpcServerHandle import net.corda.testing.node.internal.RpcServerHandle
@ -75,7 +75,7 @@ class RPCStabilityTests {
values.poll() values.poll()
} }
val first = values.peek() val first = values.peek()
if (values.size == 5 && values.all { it.keys.size == first.keys.size }) { if (values.size == 5 && values.all { it.keys == first.keys }) {
first first
} else { } else {
null null