cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 8bd33d3
Date Sun, 19 Feb 2017 09:49:38 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d84347ba8 -> 8bd33d3db


CLOUDSTACK-9790: fix NPE in case of Basic zone.


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

Branch: refs/heads/master
Commit: a01f7e76c34342974749e90a64c062b304a39bd1
Parents: 238046f
Author: Sigert Goeminne <sigert.goeminne@nuagenetworks.net>
Authored: Fri Feb 17 11:05:58 2017 +0100
Committer: Sigert Goeminne <sigert.goeminne@nuagenetworks.net>
Committed: Fri Feb 17 11:05:58 2017 +0100

----------------------------------------------------------------------
 server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a01f7e76/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 0254a64..f574982 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2919,7 +2919,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                         ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network);
                 if (sameSubnet) break;
             }
-        } else {
+        } else if(network.getGateway() != null && network.getCidr() != null) {
             vlanGateway = network.getGateway();
             vlanNetmask = NetUtils.getCidrNetmask(network.getCidr());
             sameSubnet = hasSameSubnet(ipv4, vlanGateway, vlanNetmask, newVlanGateway, newVlanNetmask,
startIP, endIP,


Mime
View raw message