[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] branch master updated: fix #5008
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] branch master updated: fix #5008 |
Date: |
Sun, 14 May 2017 15:34:30 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new 0390a22 fix #5008
0390a22 is described below
commit 0390a2244d027467193dcfb1ccf70f5866c7cc3e
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun May 14 15:34:28 2017 +0200
fix #5008
---
src/backend/taler-merchant-httpd_exchanges.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/backend/taler-merchant-httpd_exchanges.c
b/src/backend/taler-merchant-httpd_exchanges.c
index 3859390..ecbe691 100644
--- a/src/backend/taler-merchant-httpd_exchanges.c
+++ b/src/backend/taler-merchant-httpd_exchanges.c
@@ -448,6 +448,11 @@ process_find_operations (struct Exchange *exchange)
wire_fee,
exchange->trusted);
GNUNET_free_non_null (fo->wire_method);
+ if (NULL != fo->at)
+ {
+ GNUNET_SCHEDULER_cancel (fo->at);
+ fo->at = NULL;
+ }
GNUNET_free (fo);
}
return need_wire;
@@ -522,6 +527,11 @@ handle_wire_data (void *cls,
NULL,
GNUNET_NO);
GNUNET_free_non_null (fo->wire_method);
+ if (NULL != fo->at)
+ {
+ GNUNET_SCHEDULER_cancel (fo->at);
+ fo->at = NULL;
+ }
GNUNET_free (fo);
}
return;
@@ -647,6 +657,7 @@ return_result (void *cls)
struct TMH_EXCHANGES_FindOperation *fo = cls;
struct Exchange *exchange = fo->my_exchange;
+ fo->at = NULL;
if ( (GNUNET_YES ==
process_find_operations (exchange)) &&
(NULL == exchange->wire_request) &&
@@ -742,6 +753,7 @@ TMH_EXCHANGES_find_exchange (const char *chosen_exchange,
{
/* We are not currently waiting for a reply, immediately
return result */
+ GNUNET_assert (NULL == fo->at);
fo->at = GNUNET_SCHEDULER_add_now (&return_result,
fo);
return fo;
--
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 #5008,
gnunet <=