Removed unintended change to from.SourceControlData

Fixed bug where MultiSourceControl.GetModifications would leave the
from.SourceControlData changed, so the following call to
GetModifications would result in Modifications being erroneously
reported.

Author: Kenneth Ahn Jensen

project/UnitTests/Core/SourceControl/MultiSourceControlTest.cs

@@ -225,6 +225,47 @@ public void PassesIndividualSourceDataAndCombines()
             Assert.AreEqual("sc1", to.SourceControlData[1].Name, "SourceControlData[1].Name");
         }
 
+        [Test]
+        public void GetModificationsRepeatedlyShouldReturnSameResult()
+        {
+            IntegrationResult from = IntegrationResultMother.CreateSuccessful(DateTime.Now);
+            IntegrationResult to = IntegrationResultMother.CreateSuccessful(DateTime.Now.AddDays(10));
+
+            string scValue = null;
+            List<NameValuePair> list = new List<NameValuePair>();
+
+            list.Add(new NameValuePair("name0", "first"));
+            scValue = XmlConversionUtil.ConvertObjectToXml(list);
+            from.SourceControlData.Add(new NameValuePair("sc0", scValue));
+            list.Clear();
+
+            list.Add(new NameValuePair("name1", "first"));
+            list.Add(new NameValuePair("name2", "first"));
+            scValue = XmlConversionUtil.ConvertObjectToXml(list);
+            from.SourceControlData.Add(new NameValuePair("sc1", scValue));
+            list.Clear();
+
+            List<ISourceControl> sourceControls = new List<ISourceControl>();
+            sourceControls.Add(new MockSourceControl());
+            sourceControls.Add(new MockSourceControl());
+
+            MultiSourceControl multiSourceControl = new MultiSourceControl();
+            multiSourceControl.SourceControls = sourceControls.ToArray();
+
+            //// EXECUTE
+            try
+            {
+                ArrayList firstReturnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+                ArrayList secondReturnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+                ArrayList thirdReturnedMods = new ArrayList(multiSourceControl.GetModifications(from, to));
+                
+                Assert.AreEqual(secondReturnedMods.Count, thirdReturnedMods.Count);
+            } catch (Exception e)
+            {
+                Assert.Fail("GetModifications threw Exception:" + e.Message);
+            }
+        }
+
         [Test]
         public void PassesIndividualSourceDataAndCombinesSingleSourceControl()
         {

project/core/sourcecontrol/MultiSourceControl.cs

@@ -189,6 +189,10 @@ public override Modification[] GetModifications(IIntegrationResult from, IIntegr
             to.SourceControlData.Clear();
             to.SourceControlData.AddRange(finalSourceControlData);
 
+            // reset the from.SourceControlData to its original contents
+            from.SourceControlData.Clear();
+            from.SourceControlData.AddRange(originalSourceControlData);
+
             var modArray = new Modification[modificationSet.Count];
             modificationSet.Keys.CopyTo(modArray, 0);
             return modArray;