revert

svn path=/trunk/mono/; revision=28861

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index cb839e28f06eaa74ad9f023a5ac9ed834a3fc384..1913ab8f3112c21a5385189371a70016b300fa02 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,7 +1,3 @@
-2004-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
-
-       * icall.c: fixed nullref in ves_icall_type_from_name.
-
 2004-06-03  Atsushi Enomoto  <atsushi@ximian.com>
 
        * culture-info-tables.h: reflecting locale-builder updates.

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 6bc895daec0b6035fb601dde4424f2030abf8472..be2a75162d257628330af4660906a10cc88976d6 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -957,7 +957,7 @@ type_from_name (const char *str, MonoBoolean ignoreCase)
        if (assembly)
                type = mono_reflection_get_type (assembly->image, &info, ignoreCase);
        
-       if ((!info.assembly || !info.assembly.name) && !type) /* try mscorlib */
+       if (!info.assembly.name && !type) /* try mscorlib */
                type = mono_reflection_get_type (NULL, &info, ignoreCase);
 
        g_list_free (info.modifiers);