Merge pull request #1597 from fbelzunc/JENKINS-27183

[FIXED JENKINS-27183] Avoid deadlock when using build-monitor-plugin
jenkinsci · Mar 13, 2015 · 4edbb25 · 4edbb25
2 parents 8480016 + fb5540e
commit 4edbb25
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
@@ -216,6 +216,8 @@ protected void doSetName(String name) {
     protected void renameTo(final String newName) throws IOException {
         // always synchronize from bigger objects first
         final ItemGroup parent = getParent();
+        String oldName = this.name;
+        String oldFullName = getFullName();
         synchronized (parent) {
             synchronized (this) {
                 // sanity check
@@ -248,9 +250,6 @@ public Void call() throws IOException {
                     }
                 });
 
-
-                String oldName = this.name;
-                String oldFullName = getFullName();
                 File oldRoot = this.getRootDir();
 
                 doSetName(newName);
@@ -324,10 +323,9 @@ public Void call() throws IOException {
                 } catch (AbstractMethodError _) {
                     // ignore
                 }
-
-                ItemListener.fireLocationChange(this, oldFullName);
             }
         }
+        ItemListener.fireLocationChange(this, oldFullName);
     }