From a4b5f86614b5d3094f4f7f03ef936a494fb430e7 Mon Sep 17 00:00:00 2001 From: jfrijters Date: Tue, 25 May 2004 07:14:39 +0000 Subject: [PATCH] *** empty log message *** --- ikvmc/Compiler.cs | 9 ++++++++- netexp/NetExp.cs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ikvmc/Compiler.cs b/ikvmc/Compiler.cs index 1b990e4f..d08343e5 100644 --- a/ikvmc/Compiler.cs +++ b/ikvmc/Compiler.cs @@ -58,7 +58,14 @@ class Compiler return arglist; } - static int Main(string[] args) + static void Main(string[] args) + { + // FXBUG if we run a static initializer that starts a thread, we would never end, + // so we force an exit here + Environment.Exit(RealMain(args)); + } + + static int RealMain(string[] args) { AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); System.Threading.Thread.CurrentThread.Name = "compiler"; diff --git a/netexp/NetExp.cs b/netexp/NetExp.cs index 2a819d54..cbecc72f 100644 --- a/netexp/NetExp.cs +++ b/netexp/NetExp.cs @@ -74,7 +74,7 @@ public class NetExp ProcessPrivateClasses(assembly); zipFile.Close(); } - // HACK if we run on the "classpath" assembly, the awt thread gets started, + // FXBUG if we run a static initializer that starts a thread, we would never end, // so we force an exit here Environment.Exit(0); }