Refactoring: ensure proper cleanup

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

7 files changed, 21 insertions, 21 deletions

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
index 584b2b93619..b9d4a3d8078 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_ExecuteReader.cs
@@ -203,11 +203,11 @@ namespace MonoTests.System.Data.OleDb
 				finally
 				{
 					if (rdr != null) rdr.Close();
-					EndCase(exp); 
-					exp = null;
 					//cleanup db:
 					OleDbCommand cleanup = new OleDbCommand("DELETE FROM Categories WHERE CategoryName='__TEST_RECORD__'", con);
 					cleanup.ExecuteNonQuery();
+					EndCase(exp); 
+					exp = null;
 				}
 			}
 
@@ -431,10 +431,10 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
 				if (reader != null) reader.Close();
 				tr.Commit();
 				con.Close();
+				EndCase(exp);
 			}
 		}
 		[Test]
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs
index 7752016f55c..ed635ebef54 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbCommand/OleDbCommand_Parameters.cs
@@ -128,9 +128,9 @@ namespace MonoTests.System.Data.OleDb
 				}
 				finally
 				{
+					currentlyTested.ExecuteDelete(rowId);
 					EndCase(exp);
 					exp = null;
-					currentlyTested.ExecuteDelete(rowId);
 				}
 			}
 		}
@@ -174,10 +174,10 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
-				exp = null;
 				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
 				conn.Close();
+				EndCase(exp);
+				exp = null;
 			}
 
 		}
@@ -214,10 +214,10 @@ namespace MonoTests.System.Data.OleDb
 				exp = ex;
 			}
 			finally {
-				EndCase(exp);
-				exp = null;
 				DbTypeParametersCollection.ExecuteDelete(ConnectedDataProvider.EXTENDED_TYPES_TABLE_NAME, rowId);
 				conn.Close();
+				EndCase(exp);
+				exp = null;
 			}
 		}
 	}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
index d45b16035ec..af9395cd62e 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbConnection/OleDbConnection_ConnectionString.cs
@@ -116,12 +116,12 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
-				exp=null;
 				if (con != null && con.State == ConnectionState.Open)
 				{
 					con.Close();
 				}
+				EndCase(exp);
+				exp=null;
 			}
 		}
 
@@ -197,12 +197,12 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
-				exp = null;
 				if (con != null && con.State != ConnectionState.Closed)
 				{
 					con.Close();
 				}
+				EndCase(exp);
+				exp = null;
 			}
 		}
 		#endregion
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs
index d1789014c9c..0dc933ee16a 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetDateTime.cs
@@ -93,7 +93,6 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp); 
 				if (rdr != null && !rdr.IsClosed)
 				{
 					rdr.Close();
@@ -102,6 +101,7 @@ namespace MonoTests.System.Data.OleDb
 				{
 					con.Close();
 				}
+				EndCase(exp); 
 				exp = null;
 			}
 		}
@@ -140,7 +140,6 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
 				if (rdr != null && !rdr.IsClosed)
 				{
 					rdr.Close();
@@ -149,6 +148,7 @@ namespace MonoTests.System.Data.OleDb
 				{
 					con.Close();
 				}
+				EndCase(exp);
 			}
 		}
 		
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs
index 93fddc5dd0f..533a37decb6 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetGuiid_I.cs
@@ -101,8 +101,6 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
-				exp = null;
 				if ( (rdr != null) && (!rdr.IsClosed) )
 				{
 					rdr.Close();
@@ -115,6 +113,8 @@ namespace MonoTests.System.Data.OleDb
 				{
 					con.Close();
 				}
+				EndCase(exp);
+				exp = null;
 			}
 		}
 
@@ -148,8 +148,6 @@ namespace MonoTests.System.Data.OleDb
 			}
 			finally
 			{
-				EndCase(exp);
-				exp = null;
 				if ( (rdr != null) && (!rdr.IsClosed) )
 				{
 					rdr.Close();
@@ -162,6 +160,8 @@ namespace MonoTests.System.Data.OleDb
 				{
 					con.Close();
 				}
+				EndCase(exp);
+				exp = null;
 				
 			}
 		}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs
index 63dee0c8b61..67b9c338ed8 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbDataReader/OleDbDataReader_GetValue.cs
@@ -154,8 +154,6 @@ namespace MonoTests.System.Data.OleDb
 				}
 				finally
 				{
-					EndCase(exp);
-					exp = null;
 					if (rdr != null && !rdr.IsClosed)
 					{
 						rdr.Close();
@@ -165,6 +163,8 @@ namespace MonoTests.System.Data.OleDb
 						selectCon.Close();
 					}
 					currentlyTested.ExecuteDelete(rowId);
+					EndCase(exp);
+					exp = null;
 				}
 			}
 		}
diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs
index 75b6a7d4487..fa8d653da79 100644
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.OleDb.jvm/OleDbParameter/OleDbParameter_ctor_SOtype.cs
@@ -150,7 +150,6 @@ public class OleDbParameter_ctor_SOtype : ADONetTesterClass
 		}
 		finally
 		{
-			EndCase(exp);
 			if(rdr != null && !rdr.IsClosed)
 			{
 				rdr.Close();
@@ -159,6 +158,7 @@ public class OleDbParameter_ctor_SOtype : ADONetTesterClass
 			{
 				con.Close();
 			}
+			EndCase(exp);
 			exp=null;
 		}
 	}