Skip to content
Permalink
Browse files

[FIXED JENKINS-23568] Be sure to release WorkspaceList.Lease determin…

…istically in a finally block.
  • Loading branch information...
jglick committed Dec 22, 2014
1 parent c5c6bc0 commit 47fa17ba61dac99052304b5a9bb44878ed5898c6
Showing with 4 additions and 1 deletion.
  1. +3 −0 changelog.html
  2. +1 −1 core/src/main/java/hudson/model/AbstractProject.java
@@ -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>
Possible unreleased workspace lock if SCM polling fails during setup.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23568">issue 23568</a>)
<li class=bug>
Misleading description of the 'workspace' permission.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-20148">issue 20148</a>)
@@ -1451,9 +1451,9 @@ private PollingResult pollWithWorkspace(TaskListener listener, SCM scm, R lb, @N
// OTOH, if a concurrent build is chosen, the user is willing to create a multiple workspace,
// so better throughput is achieved over time (modulo the initial cost of creating that many workspaces)
// by having multiple workspaces
WorkspaceList.Lease lease = l.acquire(ws, !concurrentBuild);
Node node = lb.getBuiltOn();
Launcher launcher = ws.createLauncher(listener).decorateByEnv(getEnvironment(node,listener));
WorkspaceList.Lease lease = l.acquire(ws, !concurrentBuild);
try {
listener.getLogger().println("Polling SCM changes on " + node.getSelfLabel().getName());
LOGGER.fine("Polling SCM changes of " + getName());

1 comment on commit 47fa17b

@jglick

This comment has been minimized.

Copy link
Member Author

jglick commented on 47fa17b Dec 29, 2014

Oops, this was supposed to be for JENKINS-26201.

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.