You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/19 09:49:38 UTC
[1/2] git commit: updated refs/heads/master to 8bd33d3
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 <si...@nuagenetworks.net>
Authored: Fri Feb 17 11:05:58 2017 +0100
Committer: Sigert Goeminne <si...@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,
[2/2] git commit: updated refs/heads/master to 8bd33d3
Posted by ra...@apache.org.
Merge pull request #1952 from sgoeminn/CLOUDSTACK-9790
CLOUDSTACK-9790: fix NPE in case of Basic zone.This PR fixes the creation of a basic zone.
https://issues.apache.org/jira/browse/CLOUDSTACK-9790
* pr/1952:
CLOUDSTACK-9790: fix NPE in case of Basic zone.
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8bd33d3d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8bd33d3d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8bd33d3d
Branch: refs/heads/master
Commit: 8bd33d3db655ce837744395ff98389bf2017a056
Parents: d84347b a01f7e7
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Sun Feb 19 15:16:52 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Sun Feb 19 15:16:53 2017 +0530
----------------------------------------------------------------------
server/src/com/cloud/configuration/ConfigurationManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------