[Jcframework-commits] dotnet/Providers/AF_OLEDB COleDBConnection.vb,1.1,1.2 COleDbDatabase.vb,1.1,1.2

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/dotnet/Providers/AF_OLEDB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21135/Providers/AF_OLEDB

Modified Files:
	COleDBConnection.vb COleDbDatabase.vb 
Log Message:
Bug fixes for interface based persistence.  Problems with 3+ levels in the hierarchy.
Also some small changes to finalize.

Index: COleDbDatabase.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/Providers/AF_OLEDB/COleDbDatabase.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- COleDbDatabase.vb	7 Feb 2005 07:37:54 -0000	1.1
+++ COleDbDatabase.vb	11 Mar 2005 04:40:56 -0000	1.2
@@ -312,12 +312,13 @@
 	Public Overloads Overrides Sub Dispose(ByVal disposing As Boolean)
 		If Not m_disposed Then
 			If disposing Then
+				m_disposed = True
 				Dim conn As COleDBConnection
 				While ConnectionPool.Count > 0
 					conn = ConnectionPool.Pop
 					conn.Dispose()
+					conn = Nothing
 				End While
-				m_disposed = True
 			End If
 		End If
 	End Sub

Index: COleDBConnection.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/Providers/AF_OLEDB/COleDBConnection.vb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- COleDBConnection.vb	7 Feb 2005 07:37:54 -0000	1.1
+++ COleDBConnection.vb	11 Mar 2005 04:40:56 -0000	1.2
@@ -431,6 +431,7 @@
 		If Not m_disposed Then
 			If disposing Then
 				Try
+					m_disposed = True
 					If Me.Started AndAlso Not m_transaction Is Nothing Then
 						m_transaction.Rollback()
 						m_transaction = Nothing
@@ -443,7 +444,6 @@
 				Catch ex As Exception
 					Debug.WriteLine(ex.Message)
 				End Try
-				m_disposed = True
 			End If
 		End If
 	End Sub
@@ -451,6 +451,7 @@
 	Protected Overrides Sub Finalize()
 		' Simply call Dispose(False).
 		Dispose(False)
+		MyBase.finalize()
 	End Sub
 
 End Class