ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 09:51:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-3738: Upgrade to DJVM 1.1-RC02. (#6195)

Browse Source 
* CORDA-3738: Upgrade to DJVM 1.1-RC02.

* Update comment for DJVM 1.1's new requirements.
This commit is contained in:
Chris Rankin 2020-04-30 11:58:03 +01:00 committed by GitHub
parent 9bcb9b2f54
commit 83dd9a96da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.properties
View File

@ -30,7 +30,7 @@ snakeYamlVersion=1.19
caffeineVersion=2.7.0 caffeineVersion=2.7.0
metricsVersion=4.1.0 metricsVersion=4.1.0
metricsNewRelicVersion=1.1.1 metricsNewRelicVersion=1.1.1
djvmVersion=1.1-RC01 djvmVersion=1.1-RC02
deterministicRtVersion=1.0-RC02 deterministicRtVersion=1.0-RC02
openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4 openSourceBranch=https://github.com/corda/corda/blob/release/os/4.4
openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4 openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4

5
core/src/main/kotlin/net/corda/core/internal/TransactionVerifierServiceInternal.kt
View File

@ -401,8 +401,7 @@ class ContractVerifier(private val transactionClassLoader: ClassLoader) : Functi
override fun apply(ltx: LedgerTransaction) { override fun apply(ltx: LedgerTransaction) {
val contractClassNames = (ltx.inputs.map(StateAndRef<ContractState>::state) + ltx.outputs) val contractClassNames = (ltx.inputs.map(StateAndRef<ContractState>::state) + ltx.outputs)
.map(TransactionState<*>::contract) .mapTo(LinkedHashSet(), TransactionState<*>::contract)
.toSet()
contractClassNames.associateBy( contractClassNames.associateBy(
{ it }, { createContractClass(ltx.id, it) } { it }, { createContractClass(ltx.id, it) }
@ -410,7 +409,7 @@ class ContractVerifier(private val transactionClassLoader: ClassLoader) : Functi
try { try {
/** /**
* This function must execute with the DJVM's sandbox, which does not * This function must execute with the DJVM's sandbox, which does not
* permit user code to access [java.lang.reflect.Constructor] objects. * permit user code to invoke [java.lang.Class.getDeclaredConstructor].
* *
* [Class.newInstance] is deprecated as of Java 9. * [Class.newInstance] is deprecated as of Java 9.
*/ */

4
node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt
View File

@ -75,7 +75,7 @@ class NonDeterministicContractVerifyTest {
.returnValue.getOrThrow() .returnValue.getOrThrow()
} }
assertThat(ex) assertThat(ex)
.hasMessageMatching("^NoSuchMethodError: .*\\Qsandbox.java.lang.System.currentTimeMillis()\\E.*\$") .hasMessageStartingWith("RuleViolationError: Disallowed reference to API; java.lang.System.currentTimeMillis(), ")
} }
} }
@ -88,7 +88,7 @@ class NonDeterministicContractVerifyTest {
.returnValue.getOrThrow() .returnValue.getOrThrow()
} }
assertThat(ex) assertThat(ex)
.hasMessageMatching("^NoSuchMethodError: .*\\Qsandbox.java.lang.System.nanoTime()\\E.*\$") .hasMessageStartingWith("RuleViolationError: Disallowed reference to API; java.lang.System.nanoTime(), ")
} }
} }