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

Pass in classloader from cordapp loader

Browse Source
This commit is contained in:
Dominic Fox 2019-03-04 15:32:16 +00:00
parent af002aba05
commit b3414267b7
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ object CordappResolver {
* This could happen when trying to run different versions of the same CorDapp on the same node. * This could happen when trying to run different versions of the same CorDapp on the same node.
*/ */
@Synchronized @Synchronized
fun register(cordapp: Cordapp) { fun register(cordapp: Cordapp, classLoader: ClassLoader) {
val existingClasses = cordappClasses.keys val existingClasses = cordappClasses.keys
val classesToRegister = cordapp.cordappClasses.toSet() val classesToRegister = cordapp.cordappClasses.toSet()
val notAlreadyRegisteredClasses = classesToRegister - existingClasses val notAlreadyRegisteredClasses = classesToRegister - existingClasses
@ -41,7 +41,7 @@ object CordappResolver {
for ((className, registeredCordapps) in alreadyRegistered) { for ((className, registeredCordapps) in alreadyRegistered) {
if (registeredCordapps.any { it.jarHash == cordapp.jarHash }) continue if (registeredCordapps.any { it.jarHash == cordapp.jarHash }) continue
if (duplicateRegistrationFilter.shouldNotify(className, cordapp::class.java.classLoader)) { if (duplicateRegistrationFilter.shouldNotify(className, classLoader)) {
logger.warn("More than one CorDapp registered for $className.") logger.warn("More than one CorDapp registered for $className.")
} }
cordappClasses[className] = registeredCordapps + cordapp cordappClasses[className] = registeredCordapps + cordapp
@ -97,6 +97,7 @@ internal class DuplicateRegistrationFilter(private val ignoreList: Set<String>)
alreadySeen += className alreadySeen += className
if (className.canBeIgnored) return false if (className.canBeIgnored) return false
println("Checking status of $className with $classLoader")
return className.isContractClass(classLoader) return className.isContractClass(classLoader)
} }

12
core/src/test/kotlin/net/corda/core/internal/cordapp/CordappResolverTest.kt
View File

@ -14,6 +14,8 @@ class CordappResolverTest {
CordappResolver.clear() CordappResolver.clear()
} }
private val classLoader = ClassLoader.getSystemClassLoader()
@Test @Test
fun `the correct cordapp resolver is used after calling withCordappInfo`() { fun `the correct cordapp resolver is used after calling withCordappInfo`() {
val defaultTargetVersion = 222 val defaultTargetVersion = 222
@ -22,7 +24,7 @@ class CordappResolverTest {
contractClassNames = listOf(javaClass.name), contractClassNames = listOf(javaClass.name),
minimumPlatformVersion = 3, minimumPlatformVersion = 3,
targetPlatformVersion = defaultTargetVersion targetPlatformVersion = defaultTargetVersion
)) ), classLoader)
assertEquals(defaultTargetVersion, CordappResolver.currentTargetVersion) assertEquals(defaultTargetVersion, CordappResolver.currentTargetVersion)
val expectedTargetVersion = 555 val expectedTargetVersion = 555
@ -39,12 +41,12 @@ class CordappResolverTest {
contractClassNames = listOf(javaClass.name), contractClassNames = listOf(javaClass.name),
minimumPlatformVersion = 3, minimumPlatformVersion = 3,
targetPlatformVersion = 222 targetPlatformVersion = 222
)) ), classLoader)
CordappResolver.register(CordappImpl.TEST_INSTANCE.copy( CordappResolver.register(CordappImpl.TEST_INSTANCE.copy(
contractClassNames = listOf(javaClass.name), contractClassNames = listOf(javaClass.name),
minimumPlatformVersion = 2, minimumPlatformVersion = 2,
targetPlatformVersion = 456 targetPlatformVersion = 456
)) ), classLoader)
assertThat(CordappResolver.currentCordapp).isNotNull() assertThat(CordappResolver.currentCordapp).isNotNull()
} }
@ -55,13 +57,13 @@ class CordappResolverTest {
minimumPlatformVersion = 3, minimumPlatformVersion = 3,
targetPlatformVersion = 222, targetPlatformVersion = 222,
jarHash = SecureHash.randomSHA256() jarHash = SecureHash.randomSHA256()
)) ), classLoader)
CordappResolver.register(CordappImpl.TEST_INSTANCE.copy( CordappResolver.register(CordappImpl.TEST_INSTANCE.copy(
contractClassNames = listOf(javaClass.name), contractClassNames = listOf(javaClass.name),
minimumPlatformVersion = 2, minimumPlatformVersion = 2,
targetPlatformVersion = 456, targetPlatformVersion = 456,
jarHash = SecureHash.randomSHA256() jarHash = SecureHash.randomSHA256()
)) ), classLoader)
assertThat(CordappResolver.currentCordapp).isNull() assertThat(CordappResolver.currentCordapp).isNull()
} }
} }