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 <muralimmre...@gmail.com> Authored: Mon May 19 10:30:21 2014 +0530 Committer: Murali Reddy <muralimmre...@gmail.com> 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());
