New test.

[mono.git] / mcs / class / System.Data / System.Data.Common / Key.cs

diff --git a/mcs/class/System.Data/System.Data.Common/Key.cs b/mcs/class/System.Data/System.Data.Common/Key.cs
index 362860a28eeb2452c71b7b485c592c9130c8be91..a41dd799741e35b8c344c84f608763c067e36a8b 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/Key.cs
+++ b/mcs/class/System.Data/System.Data.Common/Key.cs
@@ -47,7 +47,6 @@ namespace System.Data.Common
                //      and always uses the _current version\r
                //so need a temp row for Eval calls\r
                DataRow _tmpRow;\r
-               static DataViewRowState DefaultRowStateFilter = (DataViewRowState.CurrentRows | DataViewRowState.OriginalRows);\r
 \r
                #endregion //Fields\r
 \r
@@ -74,7 +73,7 @@ namespace System.Data.Common
                                _rowStateFilter = rowState;\r
                        else\r
                                // FIXME : what is the correct value ?\r
-                               _rowStateFilter = DefaultRowStateFilter;\r
+                               _rowStateFilter = DataViewRowState.CurrentRows;\r
                }\r
 \r
                #endregion // Constructors\r
@@ -178,9 +177,6 @@ namespace System.Data.Common
                                                return (version == DataRowVersion.Original);\r
                                        break;\r
                                default:\r
-                                       // If _rowStateFilter has the default value, return true\r
-                                       if (_rowStateFilter ==  DefaultRowStateFilter)\r
-                                               return true;\r
                                        if ((_rowStateFilter & DataViewRowState.ModifiedCurrent) != DataViewRowState.None)\r
                                                return ((version & DataRowVersion.Default) != 0);\r
                                        if ((_rowStateFilter & DataViewRowState.ModifiedOriginal) != DataViewRowState.None)\r
@@ -259,7 +255,7 @@ namespace System.Data.Common
                        }\r
                        else {\r
                                for(int i=0; i < columns.Length; i++) {\r
-                                       if (Columns[i] != columns[i]) {\r
+                                       if (Sort [i] != ListSortDirection.Ascending || Columns[i] != columns[i]) {\r
                                                return false;\r
                                        }\r
                                }\r