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 C03B6EE79 for ; Tue, 25 Jun 2013 03:48:50 +0000 (UTC) Received: (qmail 65922 invoked by uid 500); 25 Jun 2013 03:48:50 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 65739 invoked by uid 500); 25 Jun 2013 03:48:47 -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 65731 invoked by uid 99); 25 Jun 2013 03:48:46 -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, 25 Jun 2013 03:48:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7213D82F93E; Tue, 25 Jun 2013 03:48:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kawai@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to f706f67 Date: Tue, 25 Jun 2013 03:48:45 +0000 (UTC) Updated Branches: refs/heads/master af91a8ac8 -> f706f6757 Add class check before cast DataTO might be one of SnapshotObjectTO, TemplateObjectTO or VolumeObjectTO Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f706f675 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f706f675 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f706f675 Branch: refs/heads/master Commit: f706f6757cdfcfb3fb9a288ea88e9796bc1e82d0 Parents: af91a8a Author: Hiroaki KAWAI Authored: Tue Jun 25 12:41:11 2013 +0900 Committer: Hiroaki KAWAI Committed: Tue Jun 25 12:48:01 2013 +0900 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f706f675/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 46003e9..60cde8c 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -3446,17 +3446,17 @@ ServerResource { } - VolumeObjectTO volumeObjectTO = (VolumeObjectTO)data; - - if ((volumeObjectTO.getBytesReadRate() != null) && (volumeObjectTO.getBytesReadRate() > 0)) - disk.setBytesReadRate(volumeObjectTO.getBytesReadRate()); - if ((volumeObjectTO.getBytesWriteRate() != null) && (volumeObjectTO.getBytesWriteRate() > 0)) - disk.setBytesWriteRate(volumeObjectTO.getBytesWriteRate()); - if ((volumeObjectTO.getIopsReadRate() != null) && (volumeObjectTO.getIopsReadRate() > 0)) - disk.setIopsReadRate(volumeObjectTO.getIopsReadRate()); - if ((volumeObjectTO.getIopsWriteRate() != null) && (volumeObjectTO.getIopsWriteRate() > 0)) - disk.setIopsWriteRate(volumeObjectTO.getIopsWriteRate()); - + if (data instanceof VolumeObjectTO) { + VolumeObjectTO volumeObjectTO = (VolumeObjectTO)data; + if ((volumeObjectTO.getBytesReadRate() != null) && (volumeObjectTO.getBytesReadRate() > 0)) + disk.setBytesReadRate(volumeObjectTO.getBytesReadRate()); + if ((volumeObjectTO.getBytesWriteRate() != null) && (volumeObjectTO.getBytesWriteRate() > 0)) + disk.setBytesWriteRate(volumeObjectTO.getBytesWriteRate()); + if ((volumeObjectTO.getIopsReadRate() != null) && (volumeObjectTO.getIopsReadRate() > 0)) + disk.setIopsReadRate(volumeObjectTO.getIopsReadRate()); + if ((volumeObjectTO.getIopsWriteRate() != null) && (volumeObjectTO.getIopsWriteRate() > 0)) + disk.setIopsWriteRate(volumeObjectTO.getIopsWriteRate()); + } vm.getDevices().addDevice(disk); }