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.
This commit is contained in:
Likitha Shetty 2013-03-08 13:59:02 +05:30
parent 37bab18c68
commit ee9f97f92e

View File

@ -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) {