Modified pull421 to fix failed unit tests.xs

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

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 =