dict-memcached-ascii: Fixed async commit

dovecot · May 8, 2016 · b2d3b52 · b2d3b52
1 parent ff3c2a3
commit b2d3b52
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/lib-dict/dict-memcached-ascii.c b/src/lib-dict/dict-memcached-ascii.c
@@ -607,7 +607,7 @@ memcached_ascii_transaction_send(struct dict_memcached_ascii_commit_ctx *ctx)
 	reply->callback = ctx->callback;
 	reply->context = ctx->context;
 	reply->reply_count = array_count(&dict->input_states) - old_state_count;
-	return 1;
+	return 0;
 }
 
 static int
@@ -633,13 +633,19 @@ memcached_ascii_transaction_commit(struct dict_transaction_context *_ctx,
 		commit_ctx.str = str_new(default_pool, 128);
 
 		ret = memcached_ascii_transaction_send(&commit_ctx);
-		if (!async && ret >= 0) {
+		str_free(&commit_ctx.str);
+
+		if (async && ret == 0) {
+			pool_unref(&ctx->pool);
+			return 1;
+		}
+
+		if (ret == 0) {
 			if (memcached_ascii_wait(dict, &error) < 0) {
 				i_error("%s", error);
 				ret = -1;
 			}
 		}
-		str_free(&commit_ctx.str);
 	}
 	if (callback != NULL)
 		callback(ret, context);