From 0f46d9ae151c3357176b14d8c0448683f5e7e0fb Mon Sep 17 00:00:00 2001 From: jfrijters Date: Tue, 14 Jul 2009 06:22:44 +0000 Subject: [PATCH] Take advantage of the fact that Util.getInstanceTypeFromClass() is now an intrinsic. --- classpath/java/lang/ExceptionHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classpath/java/lang/ExceptionHelper.java b/classpath/java/lang/ExceptionHelper.java index a39e687e..6b8f8fe9 100644 --- a/classpath/java/lang/ExceptionHelper.java +++ b/classpath/java/lang/ExceptionHelper.java @@ -40,8 +40,8 @@ public final class ExceptionHelper private static final Key EXCEPTION_DATA_KEY = new Key(); private static final ikvm.internal.WeakIdentityMap exceptions = new ikvm.internal.WeakIdentityMap(); private static final boolean cleanStackTrace = SafeGetEnvironmentVariable("IKVM_DISABLE_STACKTRACE_CLEANING") == null; - private static final cli.System.Type System_Reflection_MethodBase = cli.System.Type.GetType("System.Reflection.MethodBase, mscorlib"); - private static final cli.System.Type System_Exception = cli.System.Type.GetType("System.Exception, mscorlib"); + private static final cli.System.Type System_Reflection_MethodBase = ikvm.runtime.Util.getInstanceTypeFromClass(cli.System.Reflection.MethodBase.class); + private static final cli.System.Type System_Exception = ikvm.runtime.Util.getInstanceTypeFromClass(cli.System.Exception.class); // we use Activator.CreateInstance to prevent the exception from being added to the exceptions map private static final Throwable NOT_REMAPPED = (Throwable)cli.System.Activator.CreateInstance(System_Exception); private static final java.util.Hashtable failedTypes = new java.util.Hashtable();