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

fast forward merge

Browse Source
This commit is contained in:
Agnieszka Szczepanska 2021-04-21 12:16:22 +02:00
commit 88f584cac5
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/kotlin/net/corda/core/internal/ServiceHubCoreInternal.kt
View File

@ -30,5 +30,6 @@ interface TransactionsResolver {
@Suspendable @Suspendable
fun downloadDependencies(batchMode: Boolean) fun downloadDependencies(batchMode: Boolean)
@Suspendable
fun recordDependencies(usedStatesToRecord: StatesToRecord) fun recordDependencies(usedStatesToRecord: StatesToRecord)
} }

4
core/src/main/kotlin/net/corda/core/serialization/internal/AttachmentsClassLoader.kt
View File

@ -465,4 +465,6 @@ private class AttachmentURLConnection(url: URL, private val attachment: Attachme
override fun connect() { override fun connect() {
connected = true connected = true
} }
} }

4
docs/build.gradle
View File

@ -43,13 +43,13 @@ task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
includes = ['packages.md'] includes = ['packages.md']
jdkVersion = 8 jdkVersion = 8
externalDocumentationLink { externalDocumentationLink {
url = new URL("http://fasterxml.github.io/jackson-core/javadoc/2.9/") url = new URL("https://fasterxml.github.io/jackson-core/javadoc/2.9/")
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("https://docs.oracle.com/javafx/2/api/") url = new URL("https://docs.oracle.com/javafx/2/api/")
} }
externalDocumentationLink { externalDocumentationLink {
url = new URL("http://www.bouncycastle.org/docs/docs1.5on/") url = new URL("https://www.bouncycastle.org/docs/docs1.5on/")
} }
internalPackagePrefixes.collect { packagePrefix -> internalPackagePrefixes.collect { packagePrefix ->
packageOptions { packageOptions {

2
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -62,6 +62,8 @@ import net.corda.core.serialization.SingletonSerializeAsToken
import net.corda.core.serialization.internal.AttachmentsClassLoaderCache import net.corda.core.serialization.internal.AttachmentsClassLoaderCache
import net.corda.core.serialization.internal.AttachmentsClassLoaderCacheImpl import net.corda.core.serialization.internal.AttachmentsClassLoaderCacheImpl
import net.corda.core.toFuture import net.corda.core.toFuture
import net.corda.core.serialization.internal.AttachmentsClassLoaderCache
import net.corda.core.serialization.internal.AttachmentsClassLoaderCacheImpl
import net.corda.core.transactions.LedgerTransaction import net.corda.core.transactions.LedgerTransaction
import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.days import net.corda.core.utilities.days

1
node/src/main/kotlin/net/corda/node/services/DbTransactionsResolver.kt
View File

@ -94,6 +94,7 @@ class DbTransactionsResolver(private val flow: ResolveTransactionsFlow) : Transa
logger.debug { "Downloaded ${sortedDependencies?.size} dependencies from remote peer for transactions ${flow.txHashes}" } logger.debug { "Downloaded ${sortedDependencies?.size} dependencies from remote peer for transactions ${flow.txHashes}" }
} }
@Suspendable
override fun recordDependencies(usedStatesToRecord: StatesToRecord) { override fun recordDependencies(usedStatesToRecord: StatesToRecord) {
val sortedDependencies = checkNotNull(this.sortedDependencies) val sortedDependencies = checkNotNull(this.sortedDependencies)
logger.trace { "Recording ${sortedDependencies.size} dependencies for ${flow.txHashes.size} transactions" } logger.trace { "Recording ${sortedDependencies.size} dependencies for ${flow.txHashes.size} transactions" }