JENKINS-48197 Do not initialize fields already loaded from configuration

jenkinsci · Nov 23, 2017 · 7ab664a · 7ab664a
1 parent e31d064
commit 7ab664a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildItem.java
@@ -51,8 +51,12 @@ public boolean shouldRunOnSlave() {
     }
 
     public Object readResolve() {
-        results = new HashSet<>();
-        role = Role.BOTH;
+        if (results == null) {
+            results = new HashSet<>();
+        }
+        if (role == null) {
+            role = Role.BOTH;
+        }
         return this;
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/model/PostBuildStep.java
@@ -27,7 +27,9 @@ public Iterable<BuildStep> getBuildSteps() {
 
     public Object readResolve() {
         super.readResolve();
-        buildSteps = new ArrayList<>();
+        if (buildSteps == null) {
+            buildSteps = new ArrayList<>();
+        }
         return this;
     }