Fixed regression that caused getResources() on generic class loader to throw NPE.

This commit is contained in:
jfrijters 2010-08-11 08:02:32 +00:00
Родитель 7a8c72f1cb
Коммит 4e7910d43d
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -253,10 +253,13 @@ namespace IKVM.NativeCode.ikvm.runtime
return null;
#else
global::java.util.Vector v = new global::java.util.Vector();
IKVM.Internal.AssemblyClassLoader wrapper = IKVM.Internal.AssemblyClassLoader.FromAssembly(assembly);
foreach (global::java.net.URL url in wrapper.GetResources(name))
if (assembly != null)
{
v.addElement(url);
IKVM.Internal.AssemblyClassLoader wrapper = IKVM.Internal.AssemblyClassLoader.FromAssembly(assembly);
foreach (global::java.net.URL url in wrapper.GetResources(name))
{
v.addElement(url);
}
}
global::java.net.URL curl = GetClassResource(classLoader, assembly, name);
if (curl != null)