# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2017-01-25 07:43:39
# Node ID 3b82292cbec2f5257e8de538b7d954aec33758ee
# Parent  56cf4357ce2a1bafeef073fadeeef3f80770e633
# Parent  58b977bcebf1d96794e77db0b2020bf3e2fda2d1

merge

diff --git a/app/models/task.rb b/app/models/task.rb
--- a/app/models/task.rb
+++ b/app/models/task.rb
@@ -48,7 +48,7 @@
     task = nil
     begin
       Task.transaction do
-        task = Task.where(status: Task::STATUS_INQUEUE).where(lock: true).first
+        task = Task.where(status: Task::STATUS_INQUEUE).lock(true).first
         if task!=nil
           task.status = status
           task.save!