You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/09/05 00:42:34 UTC
[25/27] git commit: updated refs/heads/master to ae23144
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/e929b4ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e929b4ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e929b4ce
Branch: refs/heads/master
Commit: e929b4ceb2077ef5f81102dcaff9d804cc85d495
Parents: bae2666
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Aug 27 11:38:31 2013 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Wed Sep 4 14:49:46 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/e929b4ce/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 ff04cad..d333f27 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
@@ -3238,10 +3238,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);