From 8f4aa23ae03e1fccb4357e95fbc71134616caeab Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Mon, 15 Dec 2014 15:58:23 +0530 Subject: [PATCH] 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 --- server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 97a1ff27cb0..68a578fd218 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 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());