Merge lp:~brianaker/gearmand/options-allocate-logic-fix into lp:gearmand

Proposed by Brian Aker
Status: Merged
Merged at revision: 801
Proposed branch: lp:~brianaker/gearmand/options-allocate-logic-fix
Merge into: lp:gearmand
Diff against target: 14 lines (+1/-3)
1 file modified
libgearman/job.cc (+1/-3)
To merge this branch: bzr merge lp:~brianaker/gearmand/options-allocate-logic-fix
Reviewer Review Type Date Requested Status
Tangent Trunk Pending
Review via email: mp+172731@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
=== modified file 'libgearman/job.cc'
--- libgearman/job.cc 2013-07-02 23:51:10 +0000
+++ libgearman/job.cc 2013-07-03 04:50:34 +0000
@@ -173,9 +173,7 @@
173 if (worker)173 if (worker)
174 {174 {
175 if (job)175 if (job)
176 {176 { } // Leave it alone
177 job->options.allocated= false;
178 }
179 else177 else
180 {178 {
181 job= new (std::nothrow) gearman_job_st(*(worker->impl()));179 job= new (std::nothrow) gearman_job_st(*(worker->impl()));

Subscribers

People subscribed via source and target branches

to all changes: