rhtyd commented on a change in pull request #2394: CLOUDSTACK-10109: Fix
regression from PR #2295
URL: https://github.com/apache/cloudstack/pull/2394#discussion_r160328887
##########
File path: server/src/com/cloud/network/IpAddressManagerImpl.java
##########
@@ -964,13 +964,7 @@ public PublicIp doInTransaction(TransactionStatus status)
throws InsufficientAdd
VpcVO vpc = _vpcDao.findById(vpcId);
displayIp = vpc.isDisplay();
}
- PublicIp ip = fetchNewPublicIp(dcId, null, null, owner,
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId,
displayIp, false);
- IPAddressVO publicIp = ip.ip();
-
- markPublicIpAsAllocated(publicIp);
- _ipAddressDao.update(publicIp.getId(), publicIp);
-
- return ip;
+ return fetchNewPublicIp(dcId, null, null, owner,
VlanType.VirtualNetwork, guestNtwkId, isSourceNat, true, null, false, vpcId,
displayIp, false);
Review comment:
Yes, that PR incorrectly addressed merge conflict. One of the booleans
changed from true to false, this fixes that.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
