Move acquireWriteLock call in terminateInstance method to a separate try-finally block in-order to avoid releasing locks which are not taken
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/25abaffd Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/25abaffd Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/25abaffd Branch: refs/heads/stratos-4.1.x Commit: 25abaffdf6b55fb2fb3c8c184192731e219ad09d Parents: 1a5b99f Author: Akila Perera <[email protected]> Authored: Mon Dec 7 16:04:38 2015 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Fri Dec 25 15:01:14 2015 +0530 ---------------------------------------------------------------------- .../cloud/controller/services/impl/CloudControllerServiceImpl.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/25abaffd/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java index 8bd9ec2..f3e363f 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java @@ -677,6 +677,7 @@ public class CloudControllerServiceImpl implements CloudControllerService { } } executor.execute(new InstanceTerminator(memberContext)); + } finally { TopologyHolder.releaseWriteLock(); }
