From b3fd09124b1f2d59133485c3e43fc48700c3d447 Mon Sep 17 00:00:00 2001
From: "stu126940@mail.uni-kiel.de" <stu126940@mail.uni-kiel.de>
Date: Fri, 16 Apr 2021 10:35:52 +0200
Subject: [PATCH] Set default for unset env vars
---
.../execution/TheodoliteExecutor.kt | 27 +++++++++----------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index 01ed386ac..5fd2eedec 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -102,25 +102,22 @@ class TheodoliteExecutor(
}
private fun getResultFolderString(): String {
- var resultsFolder: String = System.getenv("RESULTS_FOLDER")
+ var resultsFolder: String = System.getenv("RESULTS_FOLDER") ?: ""
val createResultsFolder = System.getenv("CREATE_RESULTS_FOLDER") ?: "false"
- logger.info { "RESULT_FOLDER: $resultsFolder" }
-
- if (resultsFolder.isNotEmpty()){
- resultsFolder += "/"
- }
-
- val directory = File(resultsFolder)
- if (!directory.exists()) {
- logger.error { "Folder $resultsFolder does not exist" }
- if (createResultsFolder.toBoolean()) {
- directory.mkdirs()
- } else {
- throw IllegalArgumentException("Result folder not found")
+ if (resultsFolder != ""){
+ logger.info { "RESULT_FOLDER: $resultsFolder" }
+ val directory = File(resultsFolder)
+ if (!directory.exists()) {
+ logger.error { "Folder $resultsFolder does not exist" }
+ if (createResultsFolder.toBoolean()) {
+ directory.mkdirs()
+ } else {
+ throw IllegalArgumentException("Result folder not found")
+ }
}
+ resultsFolder += "/"
}
- logger.info { "RESULT_FOLDER: $resultsFolder" }
return resultsFolder
}
--
GitLab