Fix comments

[mono.git] / mcs / class / corlib / System.Threading / RegisteredWaitHandle.cs

diff --git a/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs b/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
old mode 100755 (executable)
new mode 100644 (file)
index 16148ff..62e349e
--- a/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
+++ b/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
@@ -8,9 +8,34 @@
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004, 2005 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.Runtime.InteropServices;
 
 namespace System.Threading
 {
+       [ComVisible (true)]
        public sealed class RegisteredWaitHandle : MarshalByRefObject
        {
                WaitHandle _waitObject;
@@ -63,8 +88,11 @@ namespace System.Threading
 
                private void DoCallBack (object timedOut)
                {
-                       if (_callback != null)
-                               _callback (_state, (bool)timedOut); 
+                       if (_callback != null) {
+                               try {
+                                       _callback (_state, (bool)timedOut); 
+                               } catch {}
+                       }
 
                        lock (this) 
                        {
@@ -74,6 +102,7 @@ namespace System.Threading
                        }
                }
 
+               [ComVisible (true)]
                public bool Unregister(WaitHandle waitObject) 
                {
                        lock (this) 
@@ -86,9 +115,11 @@ namespace System.Threading
                        }
                }
 
+#if ONLY_1_1
                [MonoTODO]
                ~RegisteredWaitHandle() {
                        // FIXME
                }
+#endif
        }
 }