Merge lp:~brianaker/gearmand/GEARMAN_TASK_STATE_EXCEPTION-state-fix into lp:gearmand

Proposed by Brian Aker on 2013-06-15
Status: Merged
Merged at revision: 778
Proposed branch: lp:~brianaker/gearmand/GEARMAN_TASK_STATE_EXCEPTION-state-fix
Merge into: lp:gearmand
Diff against target: 24 lines (+3/-4)
1 file modified
libgearman/run.cc (+3/-4)
To merge this branch: bzr merge lp:~brianaker/gearmand/GEARMAN_TASK_STATE_EXCEPTION-state-fix
Reviewer Review Type Date Requested Status
Tangent Trunk 2013-06-15 Pending
Review via email: mp+169609@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgearman/run.cc'
2--- libgearman/run.cc 2013-06-11 01:05:38 +0000
3+++ libgearman/run.cc 2013-06-15 09:06:28 +0000
4@@ -354,17 +354,16 @@
5 }
6 else if (task->recv->command == GEARMAN_COMMAND_WORK_EXCEPTION)
7 {
8- case GEARMAN_TASK_STATE_EXCEPTION:
9 task->options.is_known= false;
10 task->options.is_running= false;
11- task->free_result();
12- task->result_rc= GEARMAN_WORK_EXCEPTION;
13-
14 if (task->recv->argc == 1 and task->recv->data_size)
15 {
16 task->exception.store((const char*)(task->recv->data), task->recv->data_size);
17 }
18+ task->free_result();
19+ task->result_rc= GEARMAN_WORK_EXCEPTION;
20
21+ case GEARMAN_TASK_STATE_EXCEPTION:
22 if (task->func.exception_fn)
23 {
24 gearman_return_t ret= task->func.exception_fn(task->shell());

Subscribers

People subscribed via source and target branches

to all changes: