2004-03-16 Gonzalo Paniagua Javier <[email protected]>

	* appdomain.c: don't add the culture to the filename we're looking for
	if it's neutral or NULL. Fixes bug #53788. Removed redundant memset.

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

mono/metadata/ChangeLog

@@ -1,3 +1,8 @@
+2004-03-16  Gonzalo Paniagua Javier <[email protected]>
+
+	* appdomain.c: don't add the culture to the filename we're looking for
+	if it's neutral or NULL. Fixes bug #53788. Removed redundant memset.
+
 2004-03-16  Gonzalo Paniagua Javier <[email protected]>
 
 	* locales.c: don't ignore symbols when doing case insensitive compares.

mono/metadata/appdomain.c

@@ -639,10 +639,12 @@ real_load (gchar **search_path, const gchar *culture, gchar *filename)
 	for (path = search_path; *path; path++) {
 		if (**path == '\0')
 			continue; /* Ignore empty ApplicationBase */
-		if (culture && (strlen (culture) > 0))
+
+		if (culture && g_strcasecmp (culture, "neutral"))
 			fullpath = g_build_filename (*path, culture, filename, NULL);
 		else
 			fullpath = g_build_filename (*path, filename, NULL);
+
 		result = mono_assembly_open (fullpath, NULL);
 		g_free (fullpath);
 		if (result)
@@ -897,8 +899,6 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoString *assRef,
 
 	MONO_ARCH_SAVE_REGS;
 
-	memset (&aname, 0, sizeof (aname));
-
 	/* FIXME : examine evidence? */
 
 	g_assert (assRef != NULL);