2005-01-18 Sureshkumar T <tsureshkumar@novell.com>

	* OdbcDataReader.cs: GetOrdinal need not check for
	currentRow. Return -1 if column name is not found.

	fixes bug #71261. Thanks to patch given by "Appasamy T"
	<appasamy@rediffmail.com>.

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

diff --git a/mcs/class/System.Data/System.Data.Odbc/ChangeLog b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
index 4841bf3aab3a65b18cf572b0264374a89182ff77..f0a70fd0fc795895344254f218ac14e33dc66a51 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-18  Sureshkumar T  <tsureshkumar@novell.com>
+
+       * OdbcDataReader.cs: GetOrdinal need not check for
+       currentRow. Return -1 if column name is not found.
+
+       fixes bug #71261. Thanks to patch given by "Appasamy T"
+       <appasamy@rediffmail.com>.
+
 2005-01-13  Sureshkumar T  <tsureshkumar@novell.com>
 
        * OdbcDataReader.cs: Implement NextResultSet for multiple result

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index e8f9c88b595cd535cc1754eb5acfe6191109f69f..915e764565d35b2d8ab01053ced4f6fbede80256 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -138,7 +138,7 @@ namespace System.Data.Odbc
                                        return i;
                                i++;
                        }
-                       return 0;
+                       return -1;
                }
 
                // Dynamically load column descriptions as needed.
@@ -338,9 +338,6 @@ namespace System.Data.Odbc
 
                public int GetOrdinal (string name)
                {
-                       if (currentRow == -1)
-                               throw new IndexOutOfRangeException ();
-
                        int i=ColIndex(name);
 
                        if (i==-1)