From a2ff5043938389a7e4f9c37efaef77e22c10cf85 Mon Sep 17 00:00:00 2001
From: Dima <d.ovcharenko90@gmail.com>
Date: Tue, 19 Mar 2024 16:52:39 +0300
Subject: [PATCH] simplify and fix

---
 .../jenkins/library/steps/LoadExtensions.groovy      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy
index 62fd3e2..58580b9 100644
--- a/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy
@@ -62,7 +62,7 @@ class LoadExtensions implements Serializable {
         loadCommand += executeParameter
         loadCommand += ' --ibconnection "/F./build/ib"'
 
-        String vrunnerSettings = getVrunnerSettings(this.config, this.stageName)
+        String vrunnerSettings = getVrunnerSettings()
         if (steps.fileExists(vrunnerSettings)) {
             loadCommand += " --settings $vrunnerSettings"
         }
@@ -73,11 +73,15 @@ class LoadExtensions implements Serializable {
         }
     }
 
-    private static String getVrunnerSettings(JobConfiguration jobConfiguration, String stageName) {
+    private static String getVrunnerSettings() {
 
-        String optionsName = "${stageName.toLowerCase()}Options"
+        if (!this.stageName) {
+            return ""
+        }
 
-        def optionsInstance = jobConfiguration."$optionsName"
+        String optionsName = "${this.stageName.toLowerCase()}Options"
+
+        def optionsInstance = this.config."$optionsName"
 
         if (optionsInstance) {
             return optionsInstance."vrunnerSettings"