From 981d55ec263a85d5944b66ed3166a3031a7399d8 Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Fri, 4 Jun 2021 09:21:45 +1200 Subject: [PATCH 1/3] Fix possible ArgumentNullException when provider is unable to open a connection (#2794) --- src/NHibernate/Tool/hbm2ddl/SchemaExport.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs index 1cdd27614fe..a5b97a6c21a 100644 --- a/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs +++ b/src/NHibernate/Tool/hbm2ddl/SchemaExport.cs @@ -468,7 +468,11 @@ private void InitConnectionAndExecute(Action scriptAction, bool execute, { if (connectionProvider != null) { - connectionProvider.CloseConnection(connection); + if (connection != null) + { + connectionProvider.CloseConnection(connection); + } + connectionProvider.Dispose(); } } From ab050c5c8b7f773b5527eaff71a12609a38ec63a Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Tue, 8 Jun 2021 23:50:57 +1200 Subject: [PATCH 2/3] Regenerate async code for #2794 --- src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs b/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs index 6c44940aefa..34a08be5939 100644 --- a/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs +++ b/src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs @@ -525,7 +525,11 @@ public async Task ExecuteAsync(Action scriptAction, bool execute, bool j { if (connectionProvider != null) { - connectionProvider.CloseConnection(connection); + if (connection != null) + { + connectionProvider.CloseConnection(connection); + } + connectionProvider.Dispose(); } } From 15d4cc063c0c68d29e979383ec2bff0d5bb8595e Mon Sep 17 00:00:00 2001 From: Alex Zaytsev Date: Wed, 4 Aug 2021 02:07:32 +0000 Subject: [PATCH 3/3] SslMode=none for MySQL --- teamcity.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teamcity.build b/teamcity.build index 1aebbf13cbb..f5a9ce4110d 100644 --- a/teamcity.build +++ b/teamcity.build @@ -207,7 +207,7 @@ - +