From 44ba39b77a0f20cc6a763ebdc328dfeb4fe82f34 Mon Sep 17 00:00:00 2001 From: Philipp Wollermann Date: Tue, 30 Aug 2016 13:28:25 +0000 Subject: ResourceManager shouldn't set threadLocked to true if resource acquisition got interrupted. -- MOS_MIGRATED_REVID=131703083 --- .../google/devtools/build/lib/actions/ResourceManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java b/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java index 9d5edc3153..2f0483e7eb 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java +++ b/src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java @@ -227,14 +227,14 @@ public class ResourceManager { } } throw e; - } finally { - threadLocked.set(resources != ResourceSet.ZERO); - acquired(owner); + } - // Profile acquisition only if it waited for resource to become available. - if (latch != null) { - p.complete(); - } + threadLocked.set(resources != ResourceSet.ZERO); + acquired(owner); + + // Profile acquisition only if it waited for resource to become available. + if (latch != null) { + p.complete(); } return new ResourceHandle(this, owner, resources); -- cgit v1.2.3