From b6a47ce023092406fbf9f8c986ece34c60bd10c9 Mon Sep 17 00:00:00 2001
From: MattMo <matt@montoyatech.com>
Date: Wed, 1 Feb 2023 09:52:09 -0800
Subject: [PATCH] Bumped package version to 1.0.7 and fixed a bug with the
 retry logic for ExecuteReader.

---
 MySqlPlus/MySqlManagedConnection.cs | 24 ++++++++++++++----------
 MySqlPlus/MySqlPlus.csproj          |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/MySqlPlus/MySqlManagedConnection.cs b/MySqlPlus/MySqlManagedConnection.cs
index bc07b40..04039f6 100644
--- a/MySqlPlus/MySqlManagedConnection.cs
+++ b/MySqlPlus/MySqlManagedConnection.cs
@@ -195,19 +195,23 @@ namespace MontoyaTech.MySqlPlus
                         ex.Message.ToLower().Contains("a connection attempt failed because the connected party did not properly respond after a period of time") ||
                         ex.Message.ToLower().Contains("an existing connection was forcibly closed by the remote host"))
                     {
-                        //Attempt to reopen the connection.
-                        this.Reconnect(maxRetrys, exponentialBackoff);
+                        //Attempt to reconnect, but if this fails, it means we can't try any more since the reconnect retrys more than once.
+                        if (!this.Reconnect(maxRetrys, exponentialBackoff))
+                            throw;
                     }
-
                     //See if we should retry or just throw.
-                    if (!ShouldRetryBasedOnMySqlErrorNum(code))
-                        throw;
-
-                    //If the operation took less than 5 seconds, then sleep. Otherwise continue right away. This is to prevent OpenRetry from making us wait even longer.
-                    if (GlobalTimeStamp.GetDifference(startTimestamp) <= 5000 && exponentialBackoff)
+                    else if (!ShouldRetryBasedOnMySqlErrorNum(code))
                     {
-                        Thread.Sleep(backoffSleep);
-                        backoffSleep *= 2;
+                        throw;
+                    }
+                    else
+                    {
+                        //If the operation took less than 5 seconds, then sleep. Otherwise continue right away. This is to prevent OpenRetry from making us wait even longer.
+                        if (GlobalTimeStamp.GetDifference(startTimestamp) <= 5000 && exponentialBackoff)
+                        {
+                            Thread.Sleep(backoffSleep);
+                            backoffSleep *= 2;
+                        }
                     }
                 }
             }
diff --git a/MySqlPlus/MySqlPlus.csproj b/MySqlPlus/MySqlPlus.csproj
index e7a4a43..a8893a9 100644
--- a/MySqlPlus/MySqlPlus.csproj
+++ b/MySqlPlus/MySqlPlus.csproj
@@ -7,7 +7,7 @@
     <AssemblyName>MontoyaTech.MySqlPlus</AssemblyName>
     <RootNamespace>MontoyaTech.MySqlPlus</RootNamespace>
     <Title>MontoyaTech.MySqlPlus</Title>
-    <Version>1.0.6</Version>
+    <Version>1.0.7</Version>
     <Company>MontoyaTech</Company>
     <Description>A simple C# library to help work with MySql.</Description>
     <Copyright>MontoyaTech 2023</Copyright>