Merge pull request #15 from npehrsson/master

replaces bad dispose
MRCollective · Mar 26, 2015 · b376d0b · b376d0b
2 parents 904347e + eac328a
commit b376d0b
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/NHibernate.SqlAzure/ReliableSqlDbConnection.cs b/NHibernate.SqlAzure/ReliableSqlDbConnection.cs
@@ -12,6 +12,7 @@ namespace NHibernate.SqlAzure
     /// </summary>
     public class ReliableSqlDbConnection : DbConnection
     {
+        bool disposed = false;
         /// <summary>
         /// The underlying <see cref="ReliableSqlConnection"/>.
         /// </summary>
@@ -36,13 +37,14 @@ public static explicit operator SqlConnection(ReliableSqlDbConnection connection
             return connection.ReliableConnection.Current;
         }
 
-        /// <summary>
-        /// Disposes the underling <see cref="ReliableSqlConnection"/> as well as the current class.
-        /// </summary>
-        public new void Dispose()
-        {
-            ReliableConnection.Dispose();
-            base.Dispose();
+        protected override void Dispose(bool disposing) {
+            if (disposed)
+                return;
+            if (disposing) {
+                ReliableConnection.Dispose();
+            }
+            disposed = true;
+            base.Dispose(disposing);
         }
 
         #region Wrapping code