cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject [3/3] git commit: updated refs/heads/4.2 to 78781ff
Date Mon, 29 Jul 2013 12:36:16 GMT
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/78781ff7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78781ff7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78781ff7

Branch: refs/heads/4.2
Commit: 78781ff7b815258f2775bf8bdf185e4cc665c818
Parents: c5a9518
Author: Rajesh Battala <rajesh.battala@citrix.com>
Authored: Sat Jul 27 20:28:03 2013 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Mon Jul 29 17:57:37 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/78781ff7/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<VolumeVO, Long>
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) {


Mime
View raw message