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 1219D11D58 for ; Mon, 19 May 2014 05:01:32 +0000 (UTC) Received: (qmail 30666 invoked by uid 500); 19 May 2014 05:01:31 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30624 invoked by uid 500); 19 May 2014 05:01:31 -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 30617 invoked by uid 99); 19 May 2014 05:01:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2014 05:01:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 602B39867B4; Mon, 19 May 2014 05:01:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: muralireddy@apache.org To: commits@cloudstack.apache.org Message-Id: <482f1496c9ed4fd9bb33e05fe3f53f22@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.4-forward to 8bcd254 Date: Mon, 19 May 2014 05:01:31 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.4-forward 3448ab7f1 -> 8bcd2546a CLOUDSTACK-6672: [Automation] NPE observed while listing system vms fixing NPE Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8bcd2546 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8bcd2546 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8bcd2546 Branch: refs/heads/4.4-forward Commit: 8bcd2546ac159bbfa778c7a023065a1efc7edd5e Parents: 3448ab7 Author: Murali Reddy Authored: Mon May 19 10:30:21 2014 +0530 Committer: Murali Reddy Committed: Mon May 19 10:30:21 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bcd2546/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index ce685c6..6746c13 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1209,8 +1209,8 @@ public class ApiResponseHelper implements ResponseGenerator { NetworkOffering networkOffering = ApiDBUtils.findNetworkOfferingById(network.getNetworkOfferingId()); if (networkOffering.getElasticIp()) { IpAddress ip = ApiDBUtils.findIpByAssociatedVmId(vm.getId()); - Vlan vlan = ApiDBUtils.findVlanById(ip.getVlanId()); if (ip != null) { + Vlan vlan = ApiDBUtils.findVlanById(ip.getVlanId()); vmResponse.setPublicIp(ip.getAddress().addr()); vmResponse.setPublicNetmask(vlan.getVlanNetmask()); vmResponse.setGateway(vlan.getVlanGateway());