Merge pull request #533 from zowe/1000TurquoisePogs-patch-9

Fix keyring existence check
zowe · Feb 2, 2024 · c824fd2 · c824fd2
2 parents f9cf52f + a7e5b99
commit c824fd2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/webserver.js b/lib/webserver.js
@@ -138,10 +138,10 @@ function loadPem(locations, type, keyrings, pass) {
   let saf = [];
   types.filter(type=> type.startsWith('safkeyring'))
        .forEach((type)=> { saf = saf.concat(locationsByType[type]) });
-  if (saf && os.platform() != 'os390') {
+  if (saf.length > 0 && os.platform() != 'os390') {
     bootstrapLogger.severe('ZWED0145E');//Cannot load SAF keyring content outside of z/OS'
     process.exit(constants.EXIT_NO_SAFKEYRING);
-  } else if (saf && keyring_js) {
+  } else if (saf.length > 0 && keyring_js) {
     saf.forEach((safEntry)=> {
       /*
         In the latest code it's possible the entry could start with
@@ -181,7 +181,7 @@ function loadPem(locations, type, keyrings, pass) {
                              userId, keyringName, label);
       }
     });
-  } else if (saf && !keyring_js) {
+  } else if (saf.length > 0 && !keyring_js) {
     //Cannot load SAF keyring due to missing keyring_js library');
     bootstrapLogger.warn('ZWED0150E');
   }