diff --git a/changelog.html b/changelog.html
index 95d62d1d34..7786682ca2 100644
--- a/changelog.html
+++ b/changelog.html
@@ -70,6 +70,9 @@ Upcoming changes
NOT_BUILT & other build status are reported inconsistently
(issue 11013)
+
+ Cancelling a parent multi-config build produce deserializable build.xml
+ (issue 10903)
YUI updated to 2.9
diff --git a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
index 9774c7cdc8..6c901e008a 100644
--- a/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
+++ b/core/src/main/java/hudson/util/xstream/ImmutableListConverter.java
@@ -31,8 +31,11 @@ import com.thoughtworks.xstream.converters.collections.CollectionConverter;
import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
import com.thoughtworks.xstream.converters.reflection.SerializableConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
import com.thoughtworks.xstream.mapper.Mapper;
+import hudson.util.RobustReflectionConverter;
+
import java.util.ArrayList;
import java.util.List;
@@ -61,7 +64,33 @@ public class ImmutableListConverter extends CollectionConverter {
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
- return ImmutableList.copyOf((List)super.unmarshal(reader, context));
+ String resolvesTo = reader.getAttribute("resolves-to");
+ if ("com.google.common.collect.ImmutableList$SerializedForm".equals(resolvesTo)) {
+ // Skip into the elements element. This has the real children.
+ List items = new ArrayList();
+ if (reader.hasMoreChildren()) {
+ reader.moveDown();
+ // read the individual items from xml into a list
+ while (reader.hasMoreChildren()) {
+ reader.moveDown();
+ try {
+ Object item = readItem(reader, context, items);
+ items.add(item);
+ } catch (CannotResolveClassException e) {
+ RobustReflectionConverter.addErrorInContext(context, e);
+ } catch (LinkageError e) {
+ RobustReflectionConverter.addErrorInContext(context, e);
+ }
+ reader.moveUp();
+ }
+
+ // move back up past the elements element.
+ reader.moveUp();
+ }
+ return ImmutableList.copyOf(items);
+ } else {
+ return ImmutableList.copyOf((List)super.unmarshal(reader, context));
+ }
}
@Override
diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java
index b2b722299f..d032c3b235 100644
--- a/core/src/test/java/hudson/util/XStream2Test.java
+++ b/core/src/test/java/hudson/util/XStream2Test.java
@@ -26,6 +26,7 @@ package hudson.util;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import junit.framework.TestCase;
+import hudson.matrix.MatrixRun;
import hudson.model.Result;
import hudson.model.Run;
@@ -35,9 +36,12 @@ import java.io.InputStream;
import java.util.List;
import java.util.Map;
+import jenkins.model.CauseOfInterruption;
+import jenkins.model.InterruptedBuildAction;
+
/**
* Tests for XML serialization of java objects.
- * @author Kohsuke Kawaguchi, Mike Dillon, Alan Harder
+ * @author Kohsuke Kawaguchi, Mike Dillon, Alan Harder, Richard Mortimer
*/
public class XStream2Test extends TestCase {
@@ -238,4 +242,22 @@ public class XStream2Test extends TestCase {
public static class Point {
public int x,y;
}
+
+ /**
+ * Unmarshall a matrix build.xml result.
+ * (JENKINS-10903)
+ */
+ public void testUnMarshalRunMatrix() {
+ InputStream is = XStream2Test.class.getResourceAsStream("runMatrix.xml");
+ MatrixRun result = (MatrixRun) Run.XSTREAM.fromXML(is);
+ assertNotNull(result);
+ assertNotNull(result.getActions());
+ assertEquals(2, result.getActions().size());
+ InterruptedBuildAction action = (InterruptedBuildAction) result.getActions().get(1);
+ assertNotNull(action.getCauses());
+ assertEquals(1, action.getCauses().size());
+ CauseOfInterruption.UserInterruption cause =
+ (CauseOfInterruption.UserInterruption) action.getCauses().get(0);
+ assertNotNull(cause);
+ }
}
diff --git a/core/src/test/resources/hudson/util/runMatrix.xml b/core/src/test/resources/hudson/util/runMatrix.xml
new file mode 100644
index 0000000000..37513c87b5
--- /dev/null
+++ b/core/src/test/resources/hudson/util/runMatrix.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+ MatrixProject
+ job/MatrixProject/
+ 8
+
+
+ auser
+
+
+
+
+
+
+
+
+
+ auser
+
+
+
+
+
+ 8
+ ABORTED
+ 3253844
+ windows-1252
+ false
+ amachine
+ C:\jenkins\slave\workspace\MatrixProject\blah\blah\blah
+ 1.427
+
+ auser
+
+
\ No newline at end of file