Repository: incubator-stratos Updated Branches: refs/heads/master 1f9436223 -> 7af4ab696
Fixing STRATOS-453 Signed-off-by: Manula Thantriwatte <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7af4ab69 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7af4ab69 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7af4ab69 Branch: refs/heads/master Commit: 7af4ab696f587deb9afaebda1c7404f369b569f4 Parents: 1f94362 Author: Melan Nimesh <[email protected]> Authored: Mon Feb 17 18:39:09 2014 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Mon Feb 17 18:49:07 2014 +0530 ---------------------------------------------------------------------- .../cloud/controller/impl/CloudControllerServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7af4ab69/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java index 48ff77b..05dfdd5 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/impl/CloudControllerServiceImpl.java @@ -335,7 +335,13 @@ public class CloudControllerServiceImpl implements CloudControllerService { .substring(nodeId.indexOf('/') + 1, nodeId.length()) : nodeId; memberContext.setInstanceId(instanceId); - iaas.attachVolume(instanceId, ctxt.getVolumeId(), ctxt.getDeviceName()); + try { + iaas.attachVolume(instanceId, ctxt.getVolumeId(), + ctxt.getDeviceName()); + } catch (Exception e) { + //continue without throwing an exception, since there is an instance already running + log.error("Attaching Volume to Instance [ " + instanceId + " ] failed!", e); + } } log.info("Instance is successfully starting up. "+memberContext.toString());
