From c3a61c67b0d2d8f3d035839b4277dbce9b7449f5 Mon Sep 17 00:00:00 2001
From: Vojtech Juranek <vjuranek@redhat.com>
Date: Mon, 2 Apr 2012 01:25:11 +0200
Subject: [PATCH] Modified pull421 to fix failed unit tests.xs

---
 core/src/main/java/hudson/model/AbstractBuild.java | 11 +++++++----
 core/src/test/java/hudson/util/XStream2Test.java   |  6 +++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index cf8cced4c1..28d441f772 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -896,12 +896,15 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
     }    
 
     @Override
-    public synchronized List<Action> getActions() {
-        List<Action> actions = new Vector<Action>(super.getActions());
-        //add transient actions too
-        actions.addAll(createTransientActions());       
+    public List<Action> getActions() {
+        List<Action> actions = super.getActions();
+        actions.addAll(createTransientActions());
         return actions;
     }
+    
+    public List<Action> getPersistentActions(){
+        return super.getActions();
+    }
 
     /**
      * Builds up a set of variable names that contain sensitive values that
diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java
index cecab6571c..eda108fdc6 100644
--- a/core/src/test/java/hudson/util/XStream2Test.java
+++ b/core/src/test/java/hudson/util/XStream2Test.java
@@ -251,9 +251,9 @@ public class XStream2Test extends TestCase {
         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(result.getPersistentActions());
+        assertEquals(2, result.getPersistentActions().size());
+        InterruptedBuildAction action = (InterruptedBuildAction) result.getPersistentActions().get(1);
         assertNotNull(action.getCauses());
         assertEquals(1, action.getCauses().size());
         CauseOfInterruption.UserInterruption cause =
-- 
GitLab