From b4bb963e217a6ef0e88f6d8975e8ae4ebfe63c63 Mon Sep 17 00:00:00 2001
From: Stephen Connolly <stephen.alan.connolly@gmail.com>
Date: Wed, 25 Mar 2015 09:59:50 +0000
Subject: [PATCH] Move SaveableListener notification outside of the lock

---
 core/src/main/java/hudson/model/Queue.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index 53a659ead6..b057e19a20 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -463,6 +463,7 @@ public class Queue extends ResourceController implements Saveable {
     public void save() {
         if(BulkChange.contains(this))  return;
 
+        XmlFile queueFile = new XmlFile(XSTREAM, getXMLQueueFile());
         lock.lock();
         try {
             // write out the queue state we want to save
@@ -472,19 +473,18 @@ public class Queue extends ResourceController implements Saveable {
             // write out the tasks on the queue
             for (Item item: getItems()) {
                 if(item.task instanceof TransientTask)  continue;
-            state.items.add(item);
+                state.items.add(item);
             }
 
             try {
-                XmlFile queueFile = new XmlFile(XSTREAM, getXMLQueueFile());
                 queueFile.write(state);
-                SaveableListener.fireOnChange(this, queueFile);
             } catch (IOException e) {
                 LOGGER.log(Level.WARNING, "Failed to write out the queue file " + getXMLQueueFile(), e);
             }
         } finally {
             lock.unlock();
         }
+        SaveableListener.fireOnChange(this, queueFile);
     }
 
     /**
-- 
GitLab