Merge pull request #1329 from corda/ssztuka/fix-dbmigration-regression

Fix database migration tool after CORDA-1799
This commit is contained in:
Michele Sollecito 2018-08-15 09:50:16 +01:00 committed by GitHub
commit 1f1800fbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -133,7 +133,7 @@ private fun runCommand(options: OptionSet, parser: OptionParser) {
errorAndExit("Not a valid node folder. Could not find the config file: '$config'.")
}
val nodeConfig = ConfigHelper.loadConfig(baseDirectory, config).parseAsNodeConfiguration()
val cordappLoader = JarScanningCordappLoader.fromDirectories(setOf(baseDirectory))
val cordappLoader = JarScanningCordappLoader.fromDirectories(setOf(baseDirectory, baseDirectory / "cordapps"))
val schemaService = NodeSchemaService(extraSchemas = cordappLoader.cordappSchemas, includeNotarySchemas = nodeConfig.notary != null)