X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Fdbi.c;h=261d3b249e5265b089db34f9e4c54e64de34d017;hb=f57b23c4059c67c4c2c7ab1b06c02c000bcf7250;hp=73fc6b77a4e2582b431ac109a1e9147f66535360;hpb=53b6beda9705f065a3a208437036376cba9a4e71;p=sysdb.git

diff --git a/src/utils/dbi.c b/src/utils/dbi.c
index 73fc6b7..261d3b2 100644
--- a/src/utils/dbi.c
+++ b/src/utils/dbi.c
@@ -379,8 +379,7 @@ sdb_dbi_client_connect(sdb_dbi_client_t *client)
 
 	client->conn = dbi_conn_open(driver);
 	if (! client->conn) {
-		sdb_log(SDB_LOG_ERR, "dbi: failed to open connection "
-				"object.");
+		sdb_log(SDB_LOG_ERR, "dbi: failed to open connection object.");
 		return -1;
 	}
 
@@ -546,7 +545,9 @@ sdb_dbi_client_destroy(sdb_dbi_client_t *client)
 		dbi_conn_close(client->conn);
 	client->conn = NULL;
 
-	dbi_shutdown_r(client->inst);
+	if (client->inst)
+		dbi_shutdown_r(client->inst);
+	client->inst = NULL;
 
 	if (client->options)
 		sdb_dbi_options_destroy(client->options);