Skip to content

Fix ArgumentNullException when provider is unable to open a connection #2882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 4, 2021
Merged

Fix ArgumentNullException when provider is unable to open a connection #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981d55e
Fix possible ArgumentNullException when provider is unable to open a …
hazzik Jun 3, 2021
ab050c5
Regenerate async code for #2794
hazzik Jun 8, 2021
15d4cc0
SslMode=none for MySQL
hazzik Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,11 @@ public async Task ExecuteAsync(Action<string> scriptAction, bool execute, bool j
{
if (connectionProvider != null)
{
connectionProvider.CloseConnection(connection);
if (connection != null)
{
connectionProvider.CloseConnection(connection);
}

connectionProvider.Dispose();
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/NHibernate/Tool/hbm2ddl/SchemaExport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,11 @@ private void InitConnectionAndExecute(Action<string> scriptAction, bool execute,
{
if (connectionProvider != null)
{
connectionProvider.CloseConnection(connection);
if (connection != null)
{
connectionProvider.CloseConnection(connection);
}

connectionProvider.Dispose();
}
}
Expand Down
2 changes: 1 addition & 1 deletion teamcity.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
<property name="db-service" value="MySQL57" />
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver" />
<property name="nhibernate.dialect" value="NHibernate.Dialect.MySQL5Dialect" />
<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;" />
<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;SslMode=none;" />
</target>

<target name="setup-teamcity-sqlanywhere">
Expand Down