cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [3/3] git commit: updated refs/heads/master-6-17-stable to 80a41e8
Date Wed, 03 Jul 2013 16:17:19 GMT
CLOUDSTACK-3184: updateVirtualMachine api gives java NPE.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 31df729008c748e6eafe49ff86e1da618013c551)


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

Branch: refs/heads/master-6-17-stable
Commit: 6b3257781173f11113596114c5b19366e72ffb46
Parents: 58663b3
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Wed Jul 3 16:32:38 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Wed Jul 3 21:47:07 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/vm/UserVmManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b325778/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 290f01d..5b2b283 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1783,7 +1783,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Use
 
         String description = "";
 
-        if (!displayName.equals(vmInstance.getDisplayName())) {
+        if (displayName != null && !displayName.equals(vmInstance.getDisplayName()))
{
             description += "New display name: " + displayName + ". ";
         }
 


Mime
View raw message