reset the connection on timeout exception from TDS

svn path=/branches/mono-2-2/mcs/; revision=118762

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index f5909ba2ecffd05285e43e34908d3f83e2327aa2..b97a30f0a36805638ee3ff2b0ac741cb07ca4f45 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-13  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       * SqlCommand.cs:  Reset connection when timeout occurs.
+       
 2008-11-09  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlConnection.cs (ClearPool): Added null check.

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
index 4c45ac6c1d318379f8dada17349c75c0141ba963..ec0e61da57d4140efbe9675e9abfc81dc85e4af7 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -453,6 +453,7 @@ namespace System.Data.SqlClient {
                        try {
                                Connection.Tds.ExecProc (sql, localParameters.MetaParameters, 0, true);
                        } catch (TdsTimeoutException ex) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                        } catch (TdsInternalException ex) {
                                Connection.Close ();
@@ -514,6 +515,7 @@ namespace System.Data.SqlClient {
                                                // 2) Somebody has an exclusive lock on Table/DB
                                                // In any of these cases, don't close the connection. Let the user do it
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
+                                               Connection.Tds.Reset ();
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -529,6 +531,7 @@ namespace System.Data.SqlClient {
                                        try {
                                                Connection.Tds.Execute (sql, parms, CommandTimeout, wantResults);
                                        } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
@@ -541,7 +544,8 @@ namespace System.Data.SqlClient {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
                                } catch (TdsTimeoutException ex) {
-                                               throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
+                                       Connection.Tds.Reset ();
+                                       throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
@@ -563,6 +567,7 @@ namespace System.Data.SqlClient {
                                Execute (false);
                                result = Connection.Tds.RecordsAffected;
                        } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -614,6 +619,7 @@ namespace System.Data.SqlClient {
                                                GetOutputParameters ();
                                        }
                                } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();
@@ -633,6 +639,7 @@ namespace System.Data.SqlClient {
                        try {
                                Execute (true);
                        } catch (TdsTimeoutException e) {
+                               Connection.Tds.Reset ();
                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
                        }
 
@@ -836,6 +843,7 @@ namespace System.Data.SqlClient {
                                                                                      callback,
                                                                                      state);
                                        } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
@@ -850,6 +858,7 @@ namespace System.Data.SqlClient {
                                                else
                                                        ar = Connection.Tds.BeginExecuteNonQuery (sql, parms, callback, state);
                                        } catch (TdsTimeoutException ex) {
+                                               Connection.Tds.Reset ();
                                                throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                        } catch (TdsInternalException ex) {
                                                Connection.Close ();
@@ -862,6 +871,7 @@ namespace System.Data.SqlClient {
                                try {
                                        Connection.Tds.ExecPrepared (preparedStatement, parms, CommandTimeout, wantResults);
                                } catch (TdsTimeoutException ex) {
+                                       Connection.Tds.Reset ();
                                        throw SqlException.FromTdsInternalException ((TdsInternalException) ex);
                                } catch (TdsInternalException ex) {
                                        Connection.Close ();