Skip to content

Commit 6a69a30

Browse files
hazzikbahusoid
authored andcommitted
Fix ArgumentNullException when provider is unable to open a connection (nhibernate#2882)
Back-port of nhibernate#2794
1 parent 741ce84 commit 6a69a30

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/NHibernate/Async/Tool/hbm2ddl/SchemaExport.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,11 @@ public async Task ExecuteAsync(Action<string> scriptAction, bool execute, bool j
525525
{
526526
if (connectionProvider != null)
527527
{
528-
connectionProvider.CloseConnection(connection);
528+
if (connection != null)
529+
{
530+
connectionProvider.CloseConnection(connection);
531+
}
532+
529533
connectionProvider.Dispose();
530534
}
531535
}

src/NHibernate/Tool/hbm2ddl/SchemaExport.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,11 @@ private void InitConnectionAndExecute(Action<string> scriptAction, bool execute,
468468
{
469469
if (connectionProvider != null)
470470
{
471-
connectionProvider.CloseConnection(connection);
471+
if (connection != null)
472+
{
473+
connectionProvider.CloseConnection(connection);
474+
}
475+
472476
connectionProvider.Dispose();
473477
}
474478
}

teamcity.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<property name="db-service" value="MySQL57" />
208208
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.MySqlDataDriver" />
209209
<property name="nhibernate.dialect" value="NHibernate.Dialect.MySQL5Dialect" />
210-
<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;" />
210+
<property name="nhibernate.connection.connection_string" value="Data Source=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Protocol=memory;Old Guids=True;SslMode=none;" />
211211
</target>
212212

213213
<target name="setup-teamcity-sqlanywhere">

0 commit comments

Comments
 (0)