No null Sod variables please

jenkinsci · Jun 20, 2019 · 3881e99 · 3881e99
1 parent ed66f4a
commit 3881e99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/PluginImpl.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/PluginImpl.java
@@ -149,7 +149,7 @@ public class PluginImpl extends GlobalConfiguration {
     /**
      * ScanOnDemandVariable instance.
      */
-    private ScanOnDemandVariables sodVariables;
+    private ScanOnDemandVariables sodVariables = new ScanOnDemandVariables();
 
     /**
      * Default constructor.
@@ -159,6 +159,14 @@ public PluginImpl() {
         load();
     }
 
+    protected Object readResolve() {
+        if (sodVariables == null) {
+            this.sodVariables = new ScanOnDemandVariables();
+        }
+
+        return this;
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/test/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandBaseActionTest.java b/src/test/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandBaseActionTest.java
@@ -41,7 +41,6 @@
 import java.util.concurrent.TimeUnit;
 
 import jenkins.model.Jenkins;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -67,11 +66,6 @@ public class ScanOnDemandBaseActionTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
-    @Before
-    public void setup() {
-        PluginImpl.getInstance().setSodVariables(new ScanOnDemandVariables());
-    }
-
     private static final String TO_PRINT = "ERROR";
     /**
      * Tests for performScanMethod by passing failed build.