2004-01-12 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* CultureInfo.cs: Parent returns null when lcid == parent_lcid. Fixes
	bug #52102.

svn path=/trunk/mcs/; revision=21978

diff --git a/mcs/class/corlib/System.Globalization/ChangeLog b/mcs/class/corlib/System.Globalization/ChangeLog
index bed300f478e0d57278b275a5c0df4180266b2ed8..080d33ab9bf30ffae0de901b38b15f385454f9cd 100644 (file)
--- a/mcs/class/corlib/System.Globalization/ChangeLog
+++ b/mcs/class/corlib/System.Globalization/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * CultureInfo.cs: Parent returns null when lcid == parent_lcid. Fixes
+       bug #52102.
+
 2003-12-20 Ben Maurer  <bmaurer@users.sourceforge.net>
 
        * CompareInfo.cs: Replace blah == "" with blah.Length == 0.

diff --git a/mcs/class/corlib/System.Globalization/CultureInfo.cs b/mcs/class/corlib/System.Globalization/CultureInfo.cs
index e30457311924021a12a4c73f5885cdcbb2797dca..1e2e54079c3d7c905ea42180103380d144f2a55e 100644 (file)
--- a/mcs/class/corlib/System.Globalization/CultureInfo.cs
+++ b/mcs/class/corlib/System.Globalization/CultureInfo.cs
@@ -1142,7 +1142,11 @@ namespace System.Globalization
                public virtual CultureInfo Parent
                {
                        get {
-                               return(new CultureInfo (CultureMap.lcid_to_parent_lcid (lcid)));
+                               int parent_lcid = CultureMap.lcid_to_parent_lcid (lcid);
+                               if (parent_lcid == lcid)
+                                       return null;
+
+                               return (new CultureInfo (parent_lcid));
                        }
                }