Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0679710F90 for ; Tue, 27 Aug 2013 20:14:02 +0000 (UTC) Received: (qmail 41224 invoked by uid 500); 27 Aug 2013 20:14:01 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 41117 invoked by uid 500); 27 Aug 2013 20:14:01 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 40339 invoked by uid 99); 27 Aug 2013 20:13:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Aug 2013 20:13:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 73A7F46416; Tue, 27 Aug 2013 20:13:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: animesh@apache.org To: commits@cloudstack.apache.org Date: Tue, 27 Aug 2013 20:14:03 -0000 Message-Id: <56feea5bfef845e6a20e9e43a409e2da@git.apache.org> In-Reply-To: <0ba57699e8fc454aad65de868a86c315@git.apache.org> References: <0ba57699e8fc454aad65de868a86c315@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/12] git commit: updated refs/heads/4.2 to 41d2fb3 CLOUDSTACK-4522: check before we do dynamic casting (cherry picked from commit 8099a6e200846878c2061c909609f88b437d8810) Signed-off-by: animesh 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 Authored: Tue Aug 27 11:38:31 2013 -0700 Committer: animesh 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);