From 8411dc57a2312aae478317624aaf51735e29dea2 Mon Sep 17 00:00:00 2001 From: t4lz Date: Thu, 28 Nov 2024 01:13:06 +0100 Subject: [PATCH 1/2] fix --- .../mirrord/products/tomcat/TomcatExecutionListener.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/products/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt b/modules/products/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt index 6e47c188..a6a70766 100644 --- a/modules/products/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt +++ b/modules/products/tomcat/src/main/kotlin/com/metalbear/mirrord/products/tomcat/TomcatExecutionListener.kt @@ -223,7 +223,7 @@ class TomcatExecutionListener : ExecutionListener { val startupInfoField = RunnerSpecificLocalConfigurationBit::class.java.getDeclaredField("myStartupInfo") startupInfoField.isAccessible = true - startupInfoField.set(config, patchedStartupInfo) + startupInfoField.set(config.first, patchedStartupInfo) } else { MirrordLogger.logger.debug("[${this.javaClass.name}] processStartScheduled: NOT using default - patching by changing the non-default script") config.first.startupInfo.SCRIPT = it @@ -255,7 +255,7 @@ class TomcatExecutionListener : ExecutionListener { MirrordLogger.logger.debug("[${this.javaClass.name}] restoreConfig: found saved script info") val startupInfoField = RunnerSpecificLocalConfigurationBit::class.java.getDeclaredField("myStartupInfo") startupInfoField.isAccessible = true - startupInfoField.set(config, savedScriptInfo) + startupInfoField.set(config.first, savedScriptInfo) } MirrordLogger.logger.debug("[${this.javaClass.name}] restoreConfig: removing before run task") From 88b991989001ebb46c64fda54a60cc03a78cae5d Mon Sep 17 00:00:00 2001 From: t4lz Date: Thu, 28 Nov 2024 01:14:40 +0100 Subject: [PATCH 2/2] Change changelog for towncrier, but not adding new --- changelog.d/230.fixed.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/230.fixed.md b/changelog.d/230.fixed.md index bf695ee7..a4c7b792 100644 --- a/changelog.d/230.fixed.md +++ b/changelog.d/230.fixed.md @@ -1 +1 @@ -Tomcat executions are now stopped when mirrord setup fails. \ No newline at end of file +Tomcat executions now get stopped when mirrord setup fails.