Updated Branches: refs/heads/4.2-forward 808183fdc -> 8099a6e20
CLOUDSTACK-4522: check before we do dynamic casting Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8099a6e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8099a6e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8099a6e2 Branch: refs/heads/4.2-forward Commit: 8099a6e200846878c2061c909609f88b437d8810 Parents: 808183f Author: Kelven Yang <[email protected]> Authored: Tue Aug 27 11:38:31 2013 -0700 Committer: Kelven Yang <[email protected]> Committed: Tue Aug 27 11:38:31 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8099a6e2/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 6e4d230..63d0482 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3296,10 +3296,10 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa int scsiUnitNumber = 0; for(DiskTO vol: sortedDisks) { - VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData(); - if (vol.getType() == Volume.Type.ISO) continue; + + VolumeObjectTO volumeTO = (VolumeObjectTO)vol.getData(); controllerKey = getDiskController(vol, vmSpec, ideControllerKey, scsiControllerKey);
