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

Fix merge

Browse Source
This commit is contained in:
Tudor Malene 2018-06-01 17:14:27 +01:00 committed by tudor.malene@gmail.com
parent 48de90ac77
commit 0ecacb894e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
View File

@ -109,7 +109,7 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
customSchemas = setOf(), customSchemas = setOf(),
jarPath = ContractUpgradeFlow.javaClass.protectionDomain.codeSource.location, // Core JAR location jarPath = ContractUpgradeFlow.javaClass.protectionDomain.codeSource.location, // Core JAR location
info = CordappImpl.Info("corda-core", versionInfo.vendor, versionInfo.releaseVersion), info = CordappImpl.Info("corda-core", versionInfo.vendor, versionInfo.releaseVersion),
allFlows = coreRPCFlows, allFlows = listOf(),
jarHash = SecureHash.allOnesHash jarHash = SecureHash.allOnesHash
) )
@ -183,7 +183,8 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
return this::class.java.classLoader.getResources(resource) return this::class.java.classLoader.getResources(resource)
.asSequence() .asSequence()
// This is to only scan classes from test folders. // This is to only scan classes from test folders.
.filter { url -> listOf("main", "production").none { url.toString().contains("$it/$resource") } || listOf("net.corda.core", "net.corda.node", "net.corda.finance").none { scanPackage.startsWith(it) } } .filter { url ->
listOf("main", "production/classes").none { url.toString().contains("$it/$resource") } || listOf("net.corda.core", "net.corda.node", "net.corda.finance").none { scanPackage.startsWith(it) } }
.map { url -> .map { url ->
if (url.protocol == "jar") { if (url.protocol == "jar") {
// When running tests from gradle this may be a corda module jar, so restrict to scanPackage: // When running tests from gradle this may be a corda module jar, so restrict to scanPackage: