From 868763f82bc85ac517607435931de103159fc822 Mon Sep 17 00:00:00 2001 From: Tudor Malene Date: Mon, 25 Jun 2018 15:15:52 +0100 Subject: [PATCH] Fix for running tests from Idea (#3425) --- .../kotlin/net/corda/node/internal/cordapp/CordappLoader.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt b/node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt index 288eb74ddc..b213a0fb9e 100644 --- a/node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt +++ b/node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt @@ -135,7 +135,9 @@ class CordappLoader private constructor(private val cordappJarPaths: List 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 -> + !url.toString().contains("main/$resource") || listOf("net.corda.core", "net.corda.node", "net.corda.finance").none { scanPackage.startsWith(it) } + } .map { url -> if (url.protocol == "jar") { // When running tests from gradle this may be a corda module jar, so restrict to scanPackage: