JENKINS-27183 Avoid deadlock when using build-monitor-plugin

fbelzunc · olivergondza · commit bc5713112bd9 · 2015-03-31T11:10:17.000+02:00
(cherry picked from commit fb5540e)
diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
@@ -215,6 +215,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
@@ -247,9 +249,6 @@ public Void call() throws IOException {
                     }
                 });
 
-
-                String oldName = this.name;
-                String oldFullName = getFullName();
                 File oldRoot = this.getRootDir();
 
                 doSetName(newName);
@@ -323,10 +322,9 @@ public Void call() throws IOException {
                 } catch (AbstractMethodError _) {
                     // ignore
                 }
-
-                ItemListener.fireLocationChange(this, oldFullName);
             }
         }
+        ItemListener.fireLocationChange(this, oldFullName);
     }
 
     public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractItem newItem, File destDir) throws IOException {

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,8 @@ protected void doSetName(String name) {`
`215`	`215`	`protected void renameTo(final String newName) throws IOException {`
`216`	`216`	`// always synchronize from bigger objects first`
`217`	`217`	`final ItemGroup parent = getParent();`
	`218`	`+ String oldName = this.name;`
	`219`	`+ String oldFullName = getFullName();`
`218`	`220`	`synchronized (parent) {`
`219`	`221`	`synchronized (this) {`
`220`	`222`	`// sanity check`
`@@ -247,9 +249,6 @@ public Void call() throws IOException {`
`247`	`249`	`}`
`248`	`250`	`});`
`249`	`251`
`250`		`-`
`251`		`- String oldName = this.name;`
`252`		`- String oldFullName = getFullName();`
`253`	`252`	`File oldRoot = this.getRootDir();`
`254`	`253`
`255`	`254`	`doSetName(newName);`
`@@ -323,10 +322,9 @@ public Void call() throws IOException {`
`323`	`322`	`} catch (AbstractMethodError _) {`
`324`	`323`	`// ignore`
`325`	`324`	`}`
`326`		`-`
`327`		`- ItemListener.fireLocationChange(this, oldFullName);`
`328`	`325`	`}`
`329`	`326`	`}`
	`327`	`+ ItemListener.fireLocationChange(this, oldFullName);`
`330`	`328`	`}`
`331`	`329`
`332`	`330`	`public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractItem newItem, File destDir) throws IOException {`