1 files changed, 8 insertions, 3 deletions
diff --git a/lib/redmine/nested_set/issue_nested_set.rb b/lib/redmine/nested_set/issue_nested_set.rb
index 9d525293f..eadc71161 100644
--- a/lib/redmine/nested_set/issue_nested_set.rb
+++ b/lib/redmine/nested_set/issue_nested_set.rb
@@ -149,12 +149,17 @@ module Redmine
       end
 
       def lock_nested_set
-        lock = true
         if self.class.connection.adapter_name =~ /sqlserver/i
           lock = "WITH (ROWLOCK HOLDLOCK UPDLOCK)"
+          # Custom lock for SQLServer
+          # This can be problematic if root_id or parent root_id changes
+          # before locking
+          sets_to_lock = [root_id, parent.try(:root_id)].compact.uniq
+          self.class.reorder(:id).where(:root_id => sets_to_lock).lock(lock).ids
+        else
+          sets_to_lock = [id, parent_id].compact
+          self.class.reorder(:id).where("root_id IN (SELECT root_id FROM #{self.class.table_name} WHERE id IN (?))", sets_to_lock).lock.ids
         end
-        sets_to_lock = [root_id, parent.try(:root_id)].compact.uniq
-        self.class.reorder(:id).where(:root_id => sets_to_lock).lock(lock).ids
       end
 
       def nested_set_scope