Updated Branches: refs/heads/master 96cf79535 -> 34899f9b9
CLOUDSTACK-2077:The updatePhysicalNetwork command fails to update the database Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34899f9b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34899f9b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34899f9b Branch: refs/heads/master Commit: 34899f9b999e0d92573aa7b8872e07a111811b53 Parents: 96cf795 Author: Isaac Chiang <[email protected]> Authored: Thu Apr 18 21:19:00 2013 +0530 Committer: Pranav Saxena <[email protected]> Committed: Thu Apr 18 21:19:00 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkServiceImpl.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34899f9b/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 12c6068..c4effc9 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -2445,10 +2445,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { network.setVnet(vnetString); } - - - _physicalNetworkDao.update(id, network); - for (Pair<Integer, Integer> vnetToAdd : vnetsToAdd) { s_logger.debug("Adding vnet range " + vnetToAdd.first() + "-" + vnetToAdd.second() + " for the physicalNetwork id= " + id + " and zone id=" + network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); @@ -2456,6 +2452,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } + _physicalNetworkDao.update(id, network); + return network; }
