提交 4edbb256 编写于 作者: O Oliver Gondža

Merge pull request #1597 from fbelzunc/JENKINS-27183

[FIXED JENKINS-27183] Avoid deadlock when using build-monitor-plugin
...@@ -216,6 +216,8 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet ...@@ -216,6 +216,8 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
protected void renameTo(final String newName) throws IOException { protected void renameTo(final String newName) throws IOException {
// always synchronize from bigger objects first // always synchronize from bigger objects first
final ItemGroup parent = getParent(); final ItemGroup parent = getParent();
String oldName = this.name;
String oldFullName = getFullName();
synchronized (parent) { synchronized (parent) {
synchronized (this) { synchronized (this) {
// sanity check // sanity check
...@@ -248,9 +250,6 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet ...@@ -248,9 +250,6 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
} }
}); });
String oldName = this.name;
String oldFullName = getFullName();
File oldRoot = this.getRootDir(); File oldRoot = this.getRootDir();
doSetName(newName); doSetName(newName);
...@@ -324,10 +323,9 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet ...@@ -324,10 +323,9 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
} catch (AbstractMethodError _) { } catch (AbstractMethodError _) {
// ignore // ignore
} }
ItemListener.fireLocationChange(this, oldFullName);
} }
} }
ItemListener.fireLocationChange(this, oldFullName);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册