From 95bd04e449c346aec0d9bdc30061ad27ea70d75b Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Tue, 28 Jan 2014 16:01:19 +0530
Subject: [PATCH] CLOUDSTACK-5965. VM displayname is not returned by API. If
 user doesn't supply a display name during VM launch, default it to VM
 name(uuid) in listVM response.

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

diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 07449a23e3d..08478e2958b 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -99,7 +99,11 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
         userVmResponse.setId(userVm.getUuid());
         userVmResponse.setName(userVm.getName());
 
-        userVmResponse.setDisplayName(userVm.getDisplayName());
+        if (userVm.getDisplayName() != null) {
+            userVmResponse.setDisplayName(userVm.getDisplayName());
+        } else {
+            userVmResponse.setDisplayName(userVm.getName());
+        }
 
         if (userVm.getAccountType() == Account.ACCOUNT_TYPE_PROJECT) {
             userVmResponse.setProjectId(userVm.getProjectUuid());