From 7ab8c9d1d0cb4f726a49a32b8e96e61edd58434b Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 29 Nov 2011 13:47:38 +0100 Subject: [PATCH] Bugfix for freeing memory. Added more control and verbosity on transaction opening. --- src/gdaex.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/gdaex.c b/src/gdaex.c index d40f5e3..cd9de2e 100644 --- a/src/gdaex.c +++ b/src/gdaex.c @@ -168,7 +168,6 @@ static GdaEx } g_free (moddir); - g_free (p); #else @@ -2412,14 +2411,24 @@ gdaex_begin (GdaEx *gdaex) GDA_TRANSACTION_ISOLATION_SERIALIZABLE, &error); - if (error != NULL) + if (!ret || error != NULL) { g_warning (_("Error opening transaction: %s\n"), error->message != NULL ? error->message : _("no details")); } else { - if (priv->debug > 0) + /* check transaction status */ + GdaTransactionStatus *tstatus; + + tstatus = gda_connection_get_transaction_status (priv->gda_conn); + if (tstatus == NULL + || tstatus->state == GDA_TRANSACTION_STATUS_STATE_FAILED) + { + g_warning (_("No transaction opened")); + ret = FALSE; + } + else if (priv->debug > 0) { g_message (_("Transaction opened.")); } @@ -2589,18 +2598,15 @@ gdaex_commit (GdaEx *gdaex) error = NULL; ret = gda_connection_commit_transaction (priv->gda_conn, "gdaex", &error); - if (error != NULL) + if (!ret || error != NULL) { g_warning (_("Error committing transaction: %s"), error->message != NULL ? error->message : _("no details")); ret = FALSE; } - else + else if (priv->debug > 0) { - if (priv->debug > 0) - { - g_message (_("Transaction committed.")); - } + g_message (_("Transaction committed.")); } } -- 2.49.0