diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java index 413bca248e..32c67e6b6b 100644 --- a/core/src/main/java/hudson/model/Descriptor.java +++ b/core/src/main/java/hudson/model/Descriptor.java @@ -43,6 +43,13 @@ import java.util.logging.Logger; *

* {@link Descriptor} also usually have its associated views. * + * + *

Persistence

+ *

+ * {@link Descriptor} can persist data just by storing them in fields. + * However, it is the responsibility of the derived type to properly + * invoke {@link #save()} and {@link #load()}. + * * @author Kohsuke Kawaguchi * @see Describable */ @@ -63,7 +70,9 @@ public abstract class Descriptor> { protected Descriptor(Class clazz) { this.clazz = clazz; - load(); + // doing this turns out to be very error prone, + // as field initializers in derived types will override values. + // load(); } /** @@ -79,7 +88,7 @@ public abstract class Descriptor> { * So there's no need to check that in the implementation. * * @param req - * Always non-null. This object includes all the submitted form values. + * Always non-null. This object includes all the submitted form values. * * @throws FormException * Signals a problem in the submitted form. @@ -141,8 +150,10 @@ public abstract class Descriptor> { } } - private void load() { - // load + /** + * Loads the data from the disk into this object. + */ + protected synchronized void load() { XmlFile file = getConfigFile(); if(!file.exists()) return; diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index 1ef2509fe8..c1a670c29f 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -521,6 +521,7 @@ public class CVSSCM extends AbstractCVSFamilySCM { DescriptorImpl() { super(CVSSCM.class); + load(); } protected void convert(Map oldPropertyBag) { diff --git a/core/src/main/java/hudson/scm/SubversionSCM.java b/core/src/main/java/hudson/scm/SubversionSCM.java index c62213d32f..d5fbddbd49 100644 --- a/core/src/main/java/hudson/scm/SubversionSCM.java +++ b/core/src/main/java/hudson/scm/SubversionSCM.java @@ -417,6 +417,7 @@ public class SubversionSCM extends AbstractCVSFamilySCM { DescriptorImpl() { super(SubversionSCM.class); + load(); } protected void convert(Map oldPropertyBag) { diff --git a/core/src/main/java/hudson/tasks/Ant.java b/core/src/main/java/hudson/tasks/Ant.java index 1942e13132..88cf46b768 100644 --- a/core/src/main/java/hudson/tasks/Ant.java +++ b/core/src/main/java/hudson/tasks/Ant.java @@ -107,6 +107,7 @@ public class Ant extends Builder { private DescriptorImpl() { super(Ant.class); + load(); } protected void convert(Map oldPropertyBag) { diff --git a/core/src/main/java/hudson/tasks/Mailer.java b/core/src/main/java/hudson/tasks/Mailer.java index 9698409c2d..2a381acce9 100644 --- a/core/src/main/java/hudson/tasks/Mailer.java +++ b/core/src/main/java/hudson/tasks/Mailer.java @@ -291,6 +291,7 @@ public class Mailer extends Publisher { public DescriptorImpl() { super(Mailer.class); + load(); } /** diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index bebb50d356..f9373a2ee4 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -108,6 +108,7 @@ public class Maven extends Builder { private DescriptorImpl() { super(Maven.class); + load(); } diff --git a/core/src/main/java/hudson/tasks/Shell.java b/core/src/main/java/hudson/tasks/Shell.java index cf88cd0639..1d979d2e1b 100644 --- a/core/src/main/java/hudson/tasks/Shell.java +++ b/core/src/main/java/hudson/tasks/Shell.java @@ -101,6 +101,7 @@ public class Shell extends Builder { private DescriptorImpl() { super(Shell.class); + load(); } diff --git a/core/src/main/java/hudson/triggers/SCMTrigger.java b/core/src/main/java/hudson/triggers/SCMTrigger.java index d4f2c6f766..00d2486217 100644 --- a/core/src/main/java/hudson/triggers/SCMTrigger.java +++ b/core/src/main/java/hudson/triggers/SCMTrigger.java @@ -138,6 +138,7 @@ public class SCMTrigger extends Trigger { DescriptorImpl() { super(SCMTrigger.class); + load(); // create an executor update(); }