2005-03-07 Sureshkumar T <tsureshkumar@novell.com>

	* SqlCommand.cs : Set CommandBehavior on
	ExecuteReader,ExecuteScalar,ExecuteNonQuery. This is used in
	CloseDataReader.

	This fixes bug #73252.


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

2 files changed, 28 insertions, 4 deletions

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index f8565017b9d..8c2b9b17e6e 100755
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-07  Sureshkumar T  <tsureshkumar@novell.com>
+
+	* SqlCommand.cs : Set CommandBehavior on
+	ExecuteReader,ExecuteScalar,ExecuteNonQuery. This is used in
+	CloseDataReader.
+
+	This fixes bug #73252.
+
 2005-03-03  Sureshkumar T  <tsureshkumar@novell.com>
 
 	* SqlClientFactory.cs: While creating command, create using
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
index 560b00449a9..7cee2bff7d7 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -366,6 +366,7 @@ namespace System.Data.SqlClient {
 		{
 			ValidateCommand ("ExecuteNonQuery");
 			int result = 0;
+                        behavior = CommandBehavior.Default;
 
 			try {
 				Execute (CommandBehavior.Default, false);
@@ -400,14 +401,27 @@ namespace System.Data.SqlClient {
 		{
 			ValidateCommand ("ExecuteReader");
 			try {
+                                this.behavior = behavior;
+                                Console.WriteLine (this.behavior.ToString ());
 				Execute (behavior, true);
+                                Connection.DataReader = new SqlDataReader (this);
 			}
 			catch (TdsTimeoutException e) {
-				throw SqlException.FromTdsInternalException ((TdsInternalException) e);
-			}
+                                // if behavior is closeconnection, even if it throws exception
+                                // the connection has to be closed.
+                                if ((behavior & CommandBehavior.CloseConnection) != 0)
+                                        Connection.Close ();
+                                throw SqlException.FromTdsInternalException ((TdsInternalException) e);
+			} catch (SqlException) {
+                                // if behavior is closeconnection, even if it throws exception
+                                // the connection has to be closed.
+                                if ((behavior & CommandBehavior.CloseConnection) != 0)
+                                        Connection.Close ();
+
+                                throw;
+                        }
 
-			Connection.DataReader = new SqlDataReader (this);
-			return Connection.DataReader;
+                        return Connection.DataReader;
 		}
 
 		public 
@@ -417,6 +431,7 @@ namespace System.Data.SqlClient {
                 object ExecuteScalar ()
 		{
 			ValidateCommand ("ExecuteScalar");
+                        behavior = CommandBehavior.Default;
 			try {
 				Execute (CommandBehavior.Default, true);
 			}
@@ -435,6 +450,7 @@ namespace System.Data.SqlClient {
 		public XmlReader ExecuteXmlReader ()
 		{
 			ValidateCommand ("ExecuteXmlReader");
+                        behavior = CommandBehavior.Default;
 			try { 
 				Execute (CommandBehavior.Default, true);
 			}