From 280884f6d716a0e6983e277bba2b38b7f5e18614 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 3 Dec 2010 18:37:25 -0800 Subject: [PATCH] Work around VMware problem about detaching volume that has snapshot been linked with it --- api/src/com/cloud/agent/api/to/VolumeTO.java | 3 ++- core/src/com/cloud/agent/api/storage/DestroyCommand.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/src/com/cloud/agent/api/to/VolumeTO.java b/api/src/com/cloud/agent/api/to/VolumeTO.java index 5b0f6299720..3785fc96f9a 100644 --- a/api/src/com/cloud/agent/api/to/VolumeTO.java +++ b/api/src/com/cloud/agent/api/to/VolumeTO.java @@ -39,7 +39,8 @@ public class VolumeTO { private int deviceId; private String chainInfo; - public VolumeTO(long id, Volume.VolumeType type, Storage.StorageResourceType resourceType, StoragePoolType poolType, String name, String mountPoint, String path, long size, String chainInfo) { + public VolumeTO(long id, Volume.VolumeType type, Storage.StorageResourceType resourceType, StoragePoolType poolType, + String name, String mountPoint, String path, long size, String chainInfo) { this.id = id; this.name= name; this.path = path; diff --git a/core/src/com/cloud/agent/api/storage/DestroyCommand.java b/core/src/com/cloud/agent/api/storage/DestroyCommand.java index 703ae2ef8e9..255eb6c7db9 100755 --- a/core/src/com/cloud/agent/api/storage/DestroyCommand.java +++ b/core/src/com/cloud/agent/api/storage/DestroyCommand.java @@ -37,8 +37,8 @@ public class DestroyCommand extends StorageCommand { } public DestroyCommand(StoragePoolVO pool, VMTemplateStoragePoolVO templatePoolRef) { - volume = new VolumeTO(templatePoolRef.getId(), null, Storage.StorageResourceType.STORAGE_POOL, pool.getPoolType(), null, - pool.getPath(), templatePoolRef.getInstallPath(), templatePoolRef.getTemplateSize(), null); + volume = new VolumeTO(templatePoolRef.getId(), null, Storage.StorageResourceType.STORAGE_POOL, pool.getPoolType(), null, pool.getPath(), + templatePoolRef.getInstallPath(), templatePoolRef.getTemplateSize(), null); } public VolumeTO getVolume() {