cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [02/20] git commit: updated refs/heads/4.5 to 64e938b
Date Mon, 02 Feb 2015 10:17:00 GMT
CLOUDSTACK-8127. VM name not displayed after attaching data disk to a VM.
If user hasn't supplied a display name for a VM, default it to VM name in listVolume response.
This behaviour is identical to listVirtualMachine response.

(cherry picked from commit ff7997a2b139ed25f301ed1b8ad388864fcb9980)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


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

Branch: refs/heads/4.5
Commit: 8f4aa23ae03e1fccb4357e95fbc71134616caeab
Parents: 737edd9
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Mon Dec 15 15:58:23 2014 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Feb 2 13:01:33 2015 +0530

----------------------------------------------------------------------
 server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f4aa23a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
index 97a1ff2..68a578f 100644
--- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java
@@ -91,7 +91,11 @@ public class VolumeJoinDaoImpl extends GenericDaoBase<VolumeJoinVO,
Long> implem
             volResponse.setVirtualMachineId(volume.getVmUuid());
             volResponse.setVirtualMachineName(volume.getVmName());
             volResponse.setVirtualMachineState(volume.getVmState().toString());
-            volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
+            if (volume.getVmDisplayName() != null) {
+                volResponse.setVirtualMachineDisplayName(volume.getVmDisplayName());
+            } else {
+                volResponse.setVirtualMachineDisplayName(volume.getVmName());
+            }
         }
 
         volResponse.setProvisioningType(volume.getProvisioningType().toString());


Mime
View raw message