Correct connector type mapper reseting logic

roji · roji · commit 4d00a3121916 · 2018-11-23T09:14:57.000+02:00
Which led to a serious memory leak. Fixes npgsql#2234
diff --git a/src/Npgsql/NpgsqlConnection.cs b/src/Npgsql/NpgsqlConnection.cs
@@ -237,9 +237,10 @@ Task Open(bool async, CancellationToken cancellationToken)
             var mapper = Connector.TypeMapper;
             if (mapper.ChangeCounter != TypeMapping.GlobalTypeMapper.Instance.ChangeCounter)
             {
-                // We always do this synchronously which isn't amazing but not very important
+                // We always do this synchronously which isn't amazing but not very important, because
+                // it's supposed to be a pretty rare event and the whole point is to keep this method
+                // non-async
                 Connector.LoadDatabaseInfo(NpgsqlTimeout.Infinite, false).GetAwaiter().GetResult();
-                mapper.Reset();
             }
 
             Debug.Assert(Connector.Connection != null, "Open done but connector not set on Connection");
@@ -307,10 +308,7 @@ async Task OpenLong()
                         // or global mappings may have changed. Bring this up to date if needed.
                         mapper = Connector.TypeMapper;
                         if (mapper.ChangeCounter != TypeMapping.GlobalTypeMapper.Instance.ChangeCounter)
-                        {
                             await Connector.LoadDatabaseInfo(NpgsqlTimeout.Infinite, async);
-                            mapper.Reset();
-                        }
                     }
 
                     // We may have gotten an already enlisted pending connector above, no need to enlist in that case
