CLOUDSTACK-4522: check before we do dynamic casting
(cherry picked from commit 8099a6e200846878c2061c909609f88b437d8810)

Signed-off-by: animesh <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4b4315ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4b4315ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4b4315ff

Branch: refs/heads/4.2
Commit: 4b4315ff710333deb12a245956f630a4c2f1b4b7
Parents: a48e668
Author: Kelven Yang <[email protected]>
Authored: Tue Aug 27 11:38:31 2013 -0700
Committer: animesh <[email protected]>
Committed: Tue Aug 27 12:56:25 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/4b4315ff/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);
             

Reply via email to