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-2696 backport change from #4848 to release/4 (#5017)

Browse Source
This commit is contained in:
Dominic Fox 2019-04-16 17:11:03 +01:00 committed by josecoll
parent 4afbf78c79
commit 4e29d024e6
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/kotlin/net/corda/core/internal/cordapp/CordappResolver.kt
View File

@ -3,6 +3,7 @@ package net.corda.core.internal.cordapp
import net.corda.core.cordapp.Cordapp
import net.corda.core.internal.PLATFORM_VERSION
import net.corda.core.internal.VisibleForTesting
import net.corda.core.internal.warnOnce
import net.corda.core.utilities.loggerFor
import java.util.concurrent.ConcurrentHashMap
@ -10,6 +11,7 @@ import java.util.concurrent.ConcurrentHashMap
* Provides a way to acquire information about the calling CorDapp.
*/
object CordappResolver {
private val logger = loggerFor<CordappResolver>()
private val cordappClasses: ConcurrentHashMap<String, Set<Cordapp>> = ConcurrentHashMap()
@ -29,17 +31,20 @@ object CordappResolver {
*/
@Synchronized
fun register(cordapp: Cordapp) {
cordapp.cordappClasses.forEach {
val cordapps = cordappClasses[it]
if (cordapps != null) {
// we do not register CorDapps that originate from the same file.
if (cordapps.none { it.jarHash == cordapp.jarHash }) {
logger.warn("More than one CorDapp registered for $it.")
cordappClasses[it] = cordappClasses[it]!! + cordapp
}
} else {
cordappClasses[it] = setOf(cordapp)
val contractClasses = cordapp.contractClassNames.toSet()
val existingClasses = cordappClasses.keys
val classesToRegister = cordapp.cordappClasses.toSet()
val notAlreadyRegisteredClasses = classesToRegister - existingClasses
val alreadyRegistered= HashMap(cordappClasses).apply { keys.retainAll(classesToRegister) }
notAlreadyRegisteredClasses.forEach { cordappClasses[it] = setOf(cordapp) }
for ((className, registeredCordapps) in alreadyRegistered) {
if (registeredCordapps.any { it.jarHash == cordapp.jarHash }) continue
if (className in contractClasses) {
logger.warnOnce("More than one CorDapp registered for contract $className.")
}
cordappClasses[className] = registeredCordapps + cordapp
}
}
@ -81,4 +86,4 @@ object CordappResolver {
internal fun clear() {
cordappClasses.clear()
}
}
}