Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / security-manager.c

diff --git a/mono/metadata/security-manager.c b/mono/metadata/security-manager.c
index 967cf6fd32068ad7a4b1b90c645deb811cb8a049..47e916c3f9916bbddf34456dbe2caf10a963a2a0 100644 (file)
--- a/mono/metadata/security-manager.c
+++ b/mono/metadata/security-manager.c
@@ -1,14 +1,20 @@
-/*
- * security-manager.c:  Security Manager (Unmanaged side)
+/**
+ * \file
+ * Security Manager (Unmanaged side)
  *
  * Author:
  *     Sebastien Pouliot  <sebastien@ximian.com>
  *
  * Copyright 2005-2009 Novell, Inc (http://www.novell.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 #include "security-manager.h"
 
+/* Class lazy loading functions */
+static GENERATE_GET_CLASS_WITH_CACHE (security_manager, "System.Security", "SecurityManager")
+static GENERATE_TRY_GET_CLASS_WITH_CACHE (execution_context, "System.Threading", "ExecutionContext")
+
 static MonoSecurityMode mono_security_mode = MONO_SECURITY_MODE_NONE;
 
 void
@@ -35,9 +41,7 @@ mono_security_manager_get_methods (void)
                return &secman;
 
        /* Initialize */
-       secman.securitymanager = mono_class_from_name (mono_defaults.corlib, 
-               "System.Security", "SecurityManager");
-       g_assert (secman.securitymanager);
+       secman.securitymanager = mono_class_get_security_manager_class ();
        if (!secman.securitymanager->inited)
                mono_class_init (secman.securitymanager);
 
@@ -95,9 +99,10 @@ mono_get_context_capture_method (void)
                return NULL;
 
        /* older corlib revisions won't have the class (nor the method) */
-       if (mono_defaults.executioncontext_class && !method) {
-               mono_class_init (mono_defaults.executioncontext_class);
-               method = mono_class_get_method_from_name (mono_defaults.executioncontext_class, "Capture", 0);
+       MonoClass *execution_context = mono_class_try_get_execution_context_class ();
+       if (execution_context && !method) {
+               mono_class_init (execution_context);
+               method = mono_class_get_method_from_name (execution_context, "Capture", 0);
        }
 
        return method;