Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 27ED710BAD for ; Wed, 3 Jul 2013 22:25:50 +0000 (UTC) Received: (qmail 75263 invoked by uid 500); 3 Jul 2013 22:25:43 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 75179 invoked by uid 500); 3 Jul 2013 22:25:43 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 74097 invoked by uid 99); 3 Jul 2013 22:25:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jul 2013 22:25:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E74BF82A17E; Wed, 3 Jul 2013 22:25:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Date: Wed, 03 Jul 2013 22:26:20 -0000 Message-Id: <1562e6ac51984c0eaba96bb84cc84141@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [41/50] [abbrv] git commit: updated refs/heads/vmsync to 78fa5e1 CLOUDSTACK-3184: updateVirtualMachine api gives java NPE. Signed-off-by: Prasanna Santhanam 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 Authored: Wed Jul 3 16:32:38 2013 +0530 Committer: Prasanna Santhanam 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 + ". "; }