Repository: cloudstack Updated Branches: refs/heads/hotfix/CLOUDSTACK-7776 9e89a2858 -> 5ba7d9734
CLOUDSTACK-7776 rename boolean function according to convention Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5ba7d973 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ba7d973 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ba7d973 Branch: refs/heads/hotfix/CLOUDSTACK-7776 Commit: 5ba7d97342510bb640186db6b95a1ef8512f6ac6 Parents: 9e89a28 Author: Daan Hoogland <d...@onecht.net> Authored: Thu Oct 23 22:17:27 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Thu Oct 23 22:17:27 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ba7d973/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 0c8c716..5336a20 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -1994,7 +1994,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { final long oldNetworkOfferingId = network.getNetworkOfferingId(); NetworkOffering oldNtwkOff = _networkOfferingDao.findByIdIncludingRemoved(oldNetworkOfferingId); NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); - if(theNetworkOfferingWillChange(networkOffering, oldNtwkOff, network, changeCidr)) { + if(isTheNetworkOfferingChanging(networkOffering, oldNtwkOff, network, changeCidr)) { restartNetwork = true; networkOfferingChanged = true; } @@ -2279,7 +2279,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { s_logger.info("IP Reservation has been applied. The new CIDR for Guests Vms is " + guestVmCidr); } - private boolean theNetworkOfferingWillChange( + private boolean isTheNetworkOfferingChanging( NetworkOfferingVO networkOffering, NetworkOffering oldNtwkOff, final NetworkVO network,
