From 4b71feef879087c7dcc04ba79482affe329b64ff Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 26 Jun 2024 14:06:29 -0400 Subject: [PATCH 1/5] Return error when last config file is non existent or has some error Signed-off-by: Gautham Kuppuswamy --- c/configmgr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/c/configmgr.c b/c/configmgr.c index a2c49bd5b..460ff60c8 100644 --- a/c/configmgr.c +++ b/c/configmgr.c @@ -827,6 +827,9 @@ static int overloadConfiguration(ConfigManager *mgr, trace(mgr, DEBUG2, "at end of config path\n"); bool dontCare = false; config->configData = readJson(mgr,config,pathElement,&dontCare); + if ((config->configData == NULL) && !dontCare){ + return ZCFG_MISSING_CONFIG_SOURCE; + } trace(mgr, DEBUG2, "mgr->config = 0x%p\n", config); return 0; /* success */ } else { From 78e946141710ad75e3d851938baf1f9e8246da46 Mon Sep 17 00:00:00 2001 From: Gautham Kuppuswamy Date: Wed, 26 Jun 2024 15:02:33 -0400 Subject: [PATCH 2/5] Changelog updated Signed-off-by: Gautham Kuppuswamy --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48b28cf58..70dac3cd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Bugfix: fix an incorrect check in the recovery router code which might lead to the state cell-pool being released prematurely (#446) - Allocating SLH for http server with configurable value 'httpRequestHeapMaxBlocks' in yaml (#447). +- Return error when last config file is non existent or has some error (#460). ## `2.16.0` - No yaml value converted to null (#442) From 0c5a03b54d057b8b6cc45253637b3ed6dab971cd Mon Sep 17 00:00:00 2001 From: struga0258 Date: Mon, 1 Jul 2024 14:07:57 +0000 Subject: [PATCH 3/5] v2.18.0 Signed-off-by: struga0258 --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 7e741350e..cbc586eba 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index a47c9045c..1e4c463f5 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 8796bb058..ecc3d9e45 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.17.0 +version: 2.18.0 homepage: https://zowe.org keywords: From 39b07136358481d8bdd6a1ffeb5b94ac08eebfd3 Mon Sep 17 00:00:00 2001 From: James Struga Date: Mon, 1 Jul 2024 10:36:20 -0400 Subject: [PATCH 4/5] Revert back version Signed-off-by: James Struga --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index cbc586eba..7e741350e 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.18.0 +VERSION=2.17.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index 1e4c463f5..a47c9045c 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.18.0 +VERSION=2.17.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index ecc3d9e45..8796bb058 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.18.0 +version: 2.17.0 homepage: https://zowe.org keywords: From 194623a65f095a2ae57c67c11d79992a0ec0e4a5 Mon Sep 17 00:00:00 2001 From: struga0258 Date: Wed, 24 Jul 2024 14:34:47 +0000 Subject: [PATCH 5/5] v2.18.0 Signed-off-by: struga0258 --- build/configmgr.proj.env | 2 +- build/getesm.proj.env | 2 +- manifest.template.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/configmgr.proj.env b/build/configmgr.proj.env index 7e741350e..cbc586eba 100644 --- a/build/configmgr.proj.env +++ b/build/configmgr.proj.env @@ -1,5 +1,5 @@ PROJECT="configmgr" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="QUICKJS LIBYAML" QUICKJS="quickjs" diff --git a/build/getesm.proj.env b/build/getesm.proj.env index a47c9045c..1e4c463f5 100644 --- a/build/getesm.proj.env +++ b/build/getesm.proj.env @@ -1,3 +1,3 @@ PROJECT="getesm" -VERSION=2.17.0 +VERSION=2.18.0 DEPS="" diff --git a/manifest.template.yaml b/manifest.template.yaml index 8796bb058..ecc3d9e45 100644 --- a/manifest.template.yaml +++ b/manifest.template.yaml @@ -1,7 +1,7 @@ --- name: zowe-common-c -version: 2.17.0 +version: 2.18.0 homepage: https://zowe.org keywords: