From 8cfd374f048452fcfb9644afb7ebd9a5c494f6c3 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 6 Feb 2015 17:43:12 +0530 Subject: [PATCH] CLOUDSTACK-8224: Don't try to unlock if template is not locked Signed-off-by: Rohit Yadav --- .../org/apache/cloudstack/storage/volume/VolumeServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 0fd97920d88..02b4095218d 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -558,14 +558,12 @@ public class VolumeServiceImpl implements VolumeService { DataObject templateOnPrimaryStoreObj = context.destObj; if (!result.isSuccess()) { templateOnPrimaryStoreObj.processEvent(Event.OperationFailed); - _tmpltPoolDao.releaseFromLockTable(context.getTemplatePoolId()); res.setResult(result.getResult()); future.complete(res); return null; } templateOnPrimaryStoreObj.processEvent(Event.OperationSuccessed, result.getAnswer()); - _tmpltPoolDao.releaseFromLockTable(context.getTemplatePoolId()); createVolumeFromBaseImageAsync(context.volume, templateOnPrimaryStoreObj, context.dataStore, future); return null; }