From 255cec6af37927134b3b41b80102862449de65b5 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Fri, 1 May 2020 22:27:58 +0200 Subject: [PATCH] Add call to Extension.shutdown on orx-olive reload --- orx-olive/src/main/kotlin/Olive.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/orx-olive/src/main/kotlin/Olive.kt b/orx-olive/src/main/kotlin/Olive.kt index 57bbe15f..148fc593 100644 --- a/orx-olive/src/main/kotlin/Olive.kt +++ b/orx-olive/src/main/kotlin/Olive.kt @@ -54,9 +54,6 @@ class Olive

(val resources: Resources? = null, private var scriptMod else -> "src/main/kotlin/${stackRootClassName().split(".").last()}.kt" } set(value) { -// require(scriptMode == ScriptMode.KOTLIN_SCRIPT) { -// "can only change the script in KOTLIN_SCRIPT mode" -// } field = value scriptChange(value) } @@ -124,7 +121,7 @@ class Olive

(val resources: Resources? = null, private var scriptMod try { logger.info("change detected, reloading script") - val scriptContents = when(scriptMode) { + val scriptContents = when (scriptMode) { ScriptMode.KOTLIN_SCRIPT -> it.readText() ScriptMode.OLIVE_PROGRAM -> { val source = it.readText() @@ -148,6 +145,9 @@ class Olive

(val resources: Resources? = null, private var scriptMod program.launch { val func = futureFunc.await() + program.extensions.forEach {extension -> + extension.shutdown(program) + } program.extensions.clear() program.extensions.addAll(originalExtensions) @@ -190,6 +190,4 @@ class Olive

(val resources: Resources? = null, private var scriptMod } } } - - } \ No newline at end of file