2004-05-31 Atsushi Enomoto <atsushi@ximian.com>

	* DataSet.cs : Loop-break of the last fix was incorrect.

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 52ba93413d31ea4033225ff08bb18af2ca8c731b..82d674144216f42d74653e12cffd3ac29ce34d89 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-31  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : Loop-break of the last fix was incorrect.
+
 2004-05-31  Atsushi Enomoto  <atsushi@ximian.com>
 
        * DataSet.cs : When a row has no parent row but the table has parent

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index 0a48e99e299f546ac221d729fa80a39155af6b03..cba10477c68df126d553708de835216a667a8ea3 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1164,9 +1164,14 @@ namespace System.Data {
                                                continue;
                                        break;
                                case 2:
+                                       bool skip = false;
                                        for (int i = 0; i < table.ParentRelations.Count; i++)
-                                               if (row.GetParentRow (table.ParentRelations [i]) != null)
+                                               if (row.GetParentRow (table.ParentRelations [i]) != null) {
+                                                       skip = true;
                                                        continue;
+                                               }
+                                       if (skip)
+                                               continue;
                                        break;
                                }