cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to 78a04c5
Date Sun, 16 Mar 2014 23:37:04 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d55c4dd80 -> 78a04c531


CLOUDSTACK-6235: listSystemVms - retrieve vlan info of EIP address only when ip address can
be found in the DB


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

Branch: refs/heads/master
Commit: 78a04c5315007daf29b89bbf65c51b999c4125c3
Parents: d55c4dd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Sun Mar 16 16:29:56 2014 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Sun Mar 16 16:29:56 2014 -0700

----------------------------------------------------------------------
 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/78a04c53/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 a37bf7b..39c435a 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1207,8 +1207,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());


Mime
View raw message