revert

svn path=/trunk/mono/; revision=28861
midnite8177 · Jun 5, 2004 · 49ee4cd · 49ee4cd
1 parent f68fd09
commit 49ee4cd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
@@ -1,7 +1,3 @@
-2004-06-05  Gonzalo Paniagua Javier <[email protected]>
-
-	* icall.c: fixed nullref in ves_icall_type_from_name.
-
 2004-06-03  Atsushi Enomoto  <[email protected]>
 
 	* culture-info-tables.h: reflecting locale-builder updates.

diff --git 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);