CLOUDSTACK-3184: updateVirtualMachine api gives java NPE. Signed-off-by: Prasanna Santhanam <t...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31df7290 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31df7290 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31df7290 Branch: refs/heads/vmsync Commit: 31df729008c748e6eafe49ff86e1da618013c551 Parents: c496743 Author: Sanjay Tripathi <sanjay.tripa...@citrix.com> Authored: Wed Jul 3 16:32:38 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> Committed: Wed Jul 3 19:39:02 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/31df7290/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 caaf96c..e5faaf1 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -1782,7 +1782,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 + ". "; }
