From 0ecacb894e6127e48b1c58e70aec8e6afb7cd874 Mon Sep 17 00:00:00 2001
From: Tudor Malene <tudor.malene@r3.com>
Date: Fri, 1 Jun 2018 17:14:27 +0100
Subject: [PATCH] Fix merge

---
 .../kotlin/net/corda/node/internal/cordapp/CordappLoader.kt  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 6e9f2bf0ca..782c3f34ab 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
@@ -109,7 +109,7 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
             customSchemas = setOf(),
             jarPath = ContractUpgradeFlow.javaClass.protectionDomain.codeSource.location, // Core JAR location
             info = CordappImpl.Info("corda-core", versionInfo.vendor, versionInfo.releaseVersion),
-            allFlows = coreRPCFlows,
+            allFlows = listOf(),
             jarHash = SecureHash.allOnesHash
     )
 
@@ -183,7 +183,8 @@ class CordappLoader private constructor(private val cordappJarPaths: List<Restri
             return this::class.java.classLoader.getResources(resource)
                     .asSequence()
                     // 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 ->
                         if (url.protocol == "jar") {
                             // When running tests from gradle this may be a corda module jar, so restrict to scanPackage: