CLOUDSTACK-1509. During CreateVLANIPRange while trying to assign Public IPs to a new network if the network offering is persistent we get an NPE. Since associateIpRangeToAccount starts and commits a seaparte transaction, commit the transaction started for createVlanAndPublicIpRange before calling associateIpAddressListToAccount.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ee9f97f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ee9f97f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ee9f97f9 Branch: refs/heads/gslb-wip Commit: ee9f97f92ef7d395f6a15f92225c9964e86a15e8 Parents: 37bab18 Author: Likitha Shetty <likitha.she...@citrix.com> Authored: Fri Mar 8 13:59:02 2013 +0530 Committer: Likitha Shetty <likitha.she...@citrix.com> Committed: Fri Mar 8 13:59:02 2013 +0530 ---------------------------------------------------------------------- .../configuration/ConfigurationManagerImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ee9f97f9/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 62f4fd5..7f449de 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2330,10 +2330,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr); + txn.commit(); if (associateIpRangeToAccount) { _networkMgr.associateIpAddressListToAccount(userId, vlanOwner.getId(), zoneId, vlan.getId(), null); } - txn.commit(); // Associate ips to the network if (associateIpRangeToAccount) {
