Merge pull request dotnet#646 from stephentoub/port_2642

Port dotnet/coreclr#2642 to CoreRT
steveharter · Jan 14, 2016 · 6532e47 · 6532e47
2 parents 811a323 + 3122f02
commit 6532e47
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/src/System.Private.Threading/src/System/AggregateException.cs b/src/System.Private.Threading/src/System/AggregateException.cs
@@ -379,6 +379,30 @@ public AggregateException Flatten()
             return new AggregateException(Message, flattenedExceptions);
         }
 
+        /// <summary>Gets a message that describes the exception.</summary>
+        public override string Message
+        {
+            get
+            {
+                if (m_innerExceptions.Count == 0)
+                {
+                    return base.Message;
+                }
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append(base.Message);
+                sb.Append(' ');
+                for (int i = 0; i < m_innerExceptions.Count; i++)
+                {
+                    sb.Append('(');
+                    sb.Append(m_innerExceptions[i].Message);
+                    sb.Append(") ");
+                }
+                sb.Length -= 1;
+                return sb.ToString();
+            }
+        }
+
         /// <summary>
         /// Creates and returns a string representation of the current <see cref="AggregateException"/>.
         /// </summary>