Bump timeout for TaskTests.Delay_Simple (#5410)

[mono.git] / mcs / class / corlib / System.Runtime.Remoting / ServerException.cs

diff --git a/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs b/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs
index becfb5d6c6ea9fab2898f4bcd2a8a924cad842ae..f7748682cc9459eed7634882868e8cfebb7544aa 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs
+++ b/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs
@@ -6,12 +6,36 @@
 // 2002 (C) Copyright. Ximian, Inc.
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Runtime.Serialization;
 
 namespace System.Runtime.Remoting {
 
        [Serializable]
+       [System.Runtime.InteropServices.ComVisible (true)]
        public class ServerException : SystemException
        {
                public ServerException ()
@@ -24,8 +48,13 @@ namespace System.Runtime.Remoting {
                {
                }
 
-               public ServerException (string message, Exception ex)
-                       : base (message, ex)
+               public ServerException (string message, Exception InnerException)
+                       : base (message, InnerException)
+               {
+               }
+
+               internal ServerException (SerializationInfo info, StreamingContext context) 
+                       : base(info, context)
                {
                }
        }