Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-15368] Make View.getProperties synchronize on a safer …
…monitor.
  • Loading branch information
jglick committed Oct 1, 2012
1 parent 7daa5ef commit 7a552e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions changelog.html
Expand Up @@ -55,6 +55,9 @@
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Deadlock involving views.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15368">issue 15368</a>)
<li class='rfe'>
Memory footprint improvement, especially under large HTTP request threads.
<li class='major rfe'>
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/hudson/model/View.java
Expand Up @@ -282,15 +282,14 @@ public DescribableList<ViewProperty,ViewPropertyDescriptor> getProperties() {
// see JENKINS-9431
//
// until we have that, putting this logic here.
synchronized (this) {
synchronized (PropertyList.class) {
if (properties == null) {
properties = new PropertyList(this);
} else {
properties.setOwner(this);
}
return properties;
}

return properties;
}

/**
Expand Down

0 comments on commit 7a552e8

Please sign in to comment.