| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | src/server/server_worker_data_merger.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/server_worker_data_merger.c b/src/server/server_worker_data_merger.c index c0df221..07052b7 100644 --- a/src/server/server_worker_data_merger.c +++ b/src/server/server_worker_data_merger.c @@ -117,8 +117,10 @@ static void merge_thread_data return; } + pthread_mutex_unlock(&(collection->mutex)); + /** Append content of 'in' to 'out' ****************************************/ - while ((c = (char) fgetc(in)) != EOF) + while ((c = fgetc(in)) != EOF) { if (fputc(c, out) == EOF) { @@ -141,6 +143,8 @@ static void merge_thread_data fclose(in); fclose(out); + pthread_mutex_lock(&(collection->mutex)); + return; } |