[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: Fix #4925.
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: Fix #4925. |
Date: |
Mon, 27 Feb 2017 11:44:32 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 70fb2c9 Fix #4925.
70fb2c9 is described below
commit 70fb2c92c5e9a213f9d1f055f2eb244a9d728187
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Feb 27 11:43:48 2017 +0100
Fix #4925.
---
src/backend/taler-merchant-httpd_history.c | 6 +-----
src/backenddb/plugin_merchantdb_postgres.c | 1 +
src/lib/test_merchant_api.c | 5 ++++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_history.c
b/src/backend/taler-merchant-httpd_history.c
index 79dd179..07c3004 100644
--- a/src/backend/taler-merchant-httpd_history.c
+++ b/src/backend/taler-merchant-httpd_history.c
@@ -48,7 +48,7 @@ pd_cb (void *cls,
json_t *amount;
json_t *timestamp;
- GNUNET_assert (NULL != (amount = json_object_get (proposal_data, "amount")));
+ GNUNET_assert (NULL != (amount = json_copy (json_object_get (proposal_data,
"amount"))));
GNUNET_assert (NULL != (timestamp = json_object_get (proposal_data,
"timestamp")));
GNUNET_break (NULL !=
@@ -58,10 +58,6 @@ pd_cb (void *cls,
"timestamp", json_string_value
(timestamp))));
GNUNET_break (0 == json_array_append_new (response, entry));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "growing history data: %s\nptr: %p\n",
- json_dumps (response, JSON_INDENT (1)),
- response);
}
/**
diff --git a/src/backenddb/plugin_merchantdb_postgres.c
b/src/backenddb/plugin_merchantdb_postgres.c
index a6c1feb..8ec3775 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -784,6 +784,7 @@ postgres_find_proposal_data_by_date (void *cls,
cb (cb_cls,
order_id,
proposal_data);
+
GNUNET_PQ_cleanup_result (rs);
}
PQclear (result);
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index d2eabaf..fe596eb 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -761,7 +761,6 @@ history_cb (void *cls,
fail (is);
return;
}
- /*FIXME: put check on number of expected entries*/
nresult = json_array_size (json);
if (nresult != cmd->details.history.nresult)
{
@@ -772,6 +771,10 @@ history_cb (void *cls,
fail (is);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "/history data: %s\n",
+ json_dumps (json, JSON_INDENT (1)));
+
next_command (is);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-merchant] branch master updated: Fix #4925.,
gnunet <=