Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2015-05-19 00:17:19 -0400
committerWinston Prakash2015-05-19 00:17:19 -0400
commit6471e679af157b8204c780a1c641cffa51312161 (patch)
treed7cbee6e5d2518337e038f4902bf5ebe6d3baed4
parent25df9a36d80012230d61d08e07d07120390241ca (diff)
downloadorg.eclipse.hudson.core-6471e679af157b8204c780a1c641cffa51312161.tar.gz
org.eclipse.hudson.core-6471e679af157b8204c780a1c641cffa51312161.tar.xz
org.eclipse.hudson.core-6471e679af157b8204c780a1c641cffa51312161.zip
Fix: Xstream fails to unmarshall queue.xml
-rw-r--r--hudson-core/src/main/java/hudson/model/Queue.java2
-rw-r--r--hudson-core/src/main/java/hudson/model/Slave.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/hudson/model/Queue.java b/hudson-core/src/main/java/hudson/model/Queue.java
index 5e9397c3..72db62f4 100644
--- a/hudson-core/src/main/java/hudson/model/Queue.java
+++ b/hudson-core/src/main/java/hudson/model/Queue.java
@@ -1428,7 +1428,7 @@ public class Queue extends ResourceController implements Saveable {
future.setAsCancelled();
}
- private Object readResolve() {
+ public Object readResolve() {
this.future = new FutureImpl(task);
return this;
}
diff --git a/hudson-core/src/main/java/hudson/model/Slave.java b/hudson-core/src/main/java/hudson/model/Slave.java
index b6ff7d53..430f488b 100644
--- a/hudson-core/src/main/java/hudson/model/Slave.java
+++ b/hudson-core/src/main/java/hudson/model/Slave.java
@@ -330,7 +330,7 @@ public abstract class Slave extends Node implements Serializable {
/**
* Invoked by XStream when this object is read into memory.
*/
- private Object readResolve() {
+ public Object readResolve() {
// convert the old format to the new one
if (command != null && agentCommand == null) {
if (command.length() > 0) {

Back to the top