Zowe Suite v2.18.0

zowe · Aug 14, 2024 · bfef848 · bfef848
2 parents 88b0742 + f58ed6d
commit bfef848
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git 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)

diff --git 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
@@ -1,3 +1,3 @@
 PROJECT="getesm"
-VERSION=2.17.0
+VERSION=2.18.0
 DEPS=""
diff --git 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 {

diff --git 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: