Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hudson-core/src/main/java/hudson/model/Job.java2
-rw-r--r--hudson-core/src/main/java/hudson/util/XStream2.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/hudson/model/Job.java b/hudson-core/src/main/java/hudson/model/Job.java
index aea2a4a5..62573829 100644
--- a/hudson-core/src/main/java/hudson/model/Job.java
+++ b/hudson-core/src/main/java/hudson/model/Job.java
@@ -211,7 +211,7 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
}
//Bug Fix: 406889 - Non overriden job properties or properties with no values should not be written to config.xml
- private Object writeReplace() throws ObjectStreamException, IOException {
+ public Object writeReplace() throws ObjectStreamException, IOException {
persistableJobProperties.clear();
for (String key : jobProperties.keySet()) {
diff --git a/hudson-core/src/main/java/hudson/util/XStream2.java b/hudson-core/src/main/java/hudson/util/XStream2.java
index 60aac318..f5aaeb97 100644
--- a/hudson-core/src/main/java/hudson/util/XStream2.java
+++ b/hudson-core/src/main/java/hudson/util/XStream2.java
@@ -96,7 +96,6 @@ public class XStream2 extends XStream {
// this should come after all the XStream's default simpler converters,
// but before reflection-based one kicks in.
registerConverter(new AssociatedConverterImpl(this), XStream.PRIORITY_LOW);
- registerConverter(new RobustReflectionConverter(getMapper(), new JVM().bestReflectionProvider()), XStream.PRIORITY_VERY_LOW);
reflectionConverter = new RobustReflectionConverter(getMapper(), new JVM().bestReflectionProvider());
registerConverter(reflectionConverter, XStream.PRIORITY_VERY_LOW);
}

Back to the top