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

[Brian Aker]

=== modified file 'libgearman/run.cc'
--- libgearman/run.cc	2013-06-11 01:05:38 +0000
+++ libgearman/run.cc	2013-06-15 09:06:28 +0000
@@ -354,17 +354,16 @@
     }
     else if (task->recv->command == GEARMAN_COMMAND_WORK_EXCEPTION)
     {
-  case GEARMAN_TASK_STATE_EXCEPTION:
       task->options.is_known= false;
       task->options.is_running= false;
-      task->free_result();
-      task->result_rc= GEARMAN_WORK_EXCEPTION;
-
       if (task->recv->argc == 1 and task->recv->data_size)
       {
         task->exception.store((const char*)(task->recv->data), task->recv->data_size);
       }
+      task->free_result();
+      task->result_rc= GEARMAN_WORK_EXCEPTION;
 
+  case GEARMAN_TASK_STATE_EXCEPTION:
       if (task->func.exception_fn)
       {
         gearman_return_t ret= task->func.exception_fn(task->shell());