Connector/NET commit: r1203 - in branches/5.1: . Driver/Source

[rburnett]

Modified:
   branches/5.1/CHANGES
   branches/5.1/Driver/Source/datareader.cs
Log:
 - Fixed problem with connections staying open after being used with SqlDataSource.
   The problem was that we were not returning an enumerator for our reader with the
   closeReader option set to true when we were supposed to.  (Bug #34460)


Modified: branches/5.1/CHANGES
===================================================================
--- branches/5.1/CHANGES	2008-02-29 19:12:13 UTC (rev 1202)
+++ branches/5.1/CHANGES	2008-03-01 00:09:59 UTC (rev 1203)
@@ -7,6 +7,9 @@
    a transaction scope would use the default instead (bug #34448)
  - Fixed problem that causes the TableAdapter wizard to only generate insert statements.
    The problem was that our code to retrieve index columns was broken. (bug #31338)
+ - Fixed problem with connections staying open after being used with SqlDataSource.
+   The problem was that we were not returning an enumerator for our reader with the
+   closeReader option set to true when we were supposed to.  (Bug #34460)
       
 Version 5.1.5 - 
   - Fixed problem with membership provider where FindUserByEmail would fail trying to add

Modified: branches/5.1/Driver/Source/datareader.cs
===================================================================
--- branches/5.1/Driver/Source/datareader.cs	2008-02-29 19:12:13 UTC (rev 1202)
+++ branches/5.1/Driver/Source/datareader.cs	2008-03-01 00:09:59 UTC (rev 1203)
@@ -959,8 +959,8 @@
 		/// <returns></returns>
 		public override IEnumerator GetEnumerator()
 		{
-			return new DbEnumerator(this);
-		}
+            return new DbEnumerator(this, (commandBehavior & CommandBehavior.CloseConnection) != 0);
+        }
 
 		#endregion
 	}