mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.0.179

Browse Source 
Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
external/ikvm/runtime/AssemblyClassLoader.cs vendored
View File

@@ -671,7 +671,7 @@ namespace IKVM.Internal
return null;
}
protected override TypeWrapper LoadClassImpl(string name, bool throwClassNotFoundException)
protected override TypeWrapper LoadClassImpl(string name, LoadMode mode)
{
TypeWrapper tw = FindLoadedClass(name);
if (tw != null)
@@ -692,12 +692,12 @@ namespace IKVM.Internal
WaitInitializeJavaClassLoader(customClassLoader);
hasCustomClassLoader = 1;
}
return base.LoadClassImpl(name, throwClassNotFoundException);
return base.LoadClassImpl(name, mode);
}
#endif
return LoadBootstrapIfNonJavaAssembly(name)
?? LoadDynamic(name)
?? FindOrLoadGenericClass(name, false);
?? FindOrLoadGenericClass(name, LoadMode.LoadOrNull);
}
// this implements ikvm.runtime.AssemblyClassLoader.loadClass(),
@@ -708,7 +708,7 @@ namespace IKVM.Internal
return FindLoadedClass(name)
?? LoadBootstrapIfNonJavaAssembly(name)
?? LoadDynamic(name)
?? FindOrLoadGenericClass(name, false);
?? FindOrLoadGenericClass(name, LoadMode.LoadOrNull);
}
private TypeWrapper LoadBootstrapIfNonJavaAssembly(string name)
@@ -1011,7 +1011,7 @@ namespace IKVM.Internal
{
return DoLoad(name)
?? FindReferenced(name)
?? FindOrLoadGenericClass(name, true);
?? FindOrLoadGenericClass(name, LoadMode.Find);
}
internal override bool InternalsVisibleToImpl(TypeWrapper wrapper, TypeWrapper friend)