New test.

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

diff --git a/mcs/class/corlib/System.Threading/WaitHandle.cs b/mcs/class/corlib/System.Threading/WaitHandle.cs
index cc80b77bc412486f94669dd4468b81d053ac923b..9081ece31d9c559e21cc1c3fc0461bb3e15a566a 100644 (file)
--- a/mcs/class/corlib/System.Threading/WaitHandle.cs
+++ b/mcs/class/corlib/System.Threading/WaitHandle.cs
@@ -50,9 +50,7 @@ namespace System.Threading
                        if (length > 64)
                                throw new NotSupportedException ("Too many handles");
 
-                       if (waitAll && length > 1 &&
-                           (Thread.CurrentThread.ApartmentState == ApartmentState.STA ||
-                            Assembly.GetEntryAssembly ().EntryPoint.GetCustomAttributes (typeof (STAThreadAttribute), false).Length == 1))
+                       if (waitAll && length > 1 && IsSTAThread)
                                throw new NotSupportedException ("WaitAll for multiple handles is not allowed on an STA thread.");
                        
                        foreach (WaitHandle w in handles) {
@@ -63,6 +61,23 @@ namespace System.Threading
                                        throw new ArgumentException ("null element found", "waitHandle");
                        }
                }
+
+               static bool IsSTAThread {
+                       get {
+                               bool isSTA = Thread.CurrentThread.ApartmentState ==
+                                       ApartmentState.STA;
+
+                               // FIXME: remove this check after Thread.ApartmentState
+                               // has been properly implemented.
+                               if (!isSTA) {
+                                       Assembly asm = Assembly.GetEntryAssembly ();
+                                       if (asm != null)
+                                               isSTA = asm.EntryPoint.GetCustomAttributes (typeof (STAThreadAttribute), false).Length > 0;
+                               }
+
+                               return isSTA;
+                       }
+               }
                
                public static bool WaitAll(WaitHandle[] waitHandles)
                {