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 950EACF54 for ; Mon, 29 Jul 2013 13:24:00 +0000 (UTC) Received: (qmail 52222 invoked by uid 500); 29 Jul 2013 13:24:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 52023 invoked by uid 500); 29 Jul 2013 13:24:00 -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 52003 invoked by uid 99); 29 Jul 2013 13:23:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jul 2013 13:23:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4247F19075; Mon, 29 Jul 2013 13:23:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devdeep@apache.org To: commits@cloudstack.apache.org Date: Mon, 29 Jul 2013 13:24:00 -0000 Message-Id: In-Reply-To: <38d97e57ec8f48f0ae6b4d2839f270ea@git.apache.org> References: <38d97e57ec8f48f0ae6b4d2839f270ea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: updated refs/heads/master to 1b398aa CLOUDSTACK-3877 Unable to Resize Volume (kvm, vmware) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63fea5e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63fea5e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63fea5e9 Branch: refs/heads/master Commit: 63fea5e94e50c0bd9f01045f67befa9673ad7dc5 Parents: 8edf6b3 Author: Rajesh Battala Authored: Sat Jul 27 20:28:03 2013 +0530 Committer: Devdeep Singh Committed: Mon Jul 29 18:50:41 2013 +0530 ---------------------------------------------------------------------- engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63fea5e9/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java index 7696bcc..e6595b2 100755 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -241,7 +241,12 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol pstmt.setLong(1, volumeId); ResultSet rs = pstmt.executeQuery(); if (rs.next()) { - return HypervisorType.getType(rs.getString(1)); + String hypervisor; + if (rs.getString(1) != null) + hypervisor = rs.getString(1); + else + hypervisor = rs.getString(2); + return HypervisorType.getType(hypervisor); } return HypervisorType.None; } catch (SQLException e) {