Solving interpolation issue in case an empty key

Mellanox · Jul 4, 2024 · 007076c · 007076c
1 parent 03f48de
commit 007076c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/com/mellanox/cicd/Matrix.groovy b/src/com/mellanox/cicd/Matrix.groovy
@@ -868,12 +868,12 @@ def replaceVars(vars, str) {
 
     for (def entry in entrySet(vars)) {
 
+        if (entry.key == "" ||  entry.key == null || entry.value == "" || entry.value == null) {
+            continue;
+        }
         if (!res.contains('$')) {
             return res
         }
-        if (entry.value == null) {
-            continue;
-        }
         def opts = ['$' + entry.key, '${' + entry.key + '}']
         for (int i=0; i<opts.size(); i++) {
             if (res.contains(opts[i])) {