You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/17 11:26:31 UTC
[29/50] git commit: updated refs/heads/master to 3c429ee
Removing trailing spaces
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa585e34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa585e34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa585e34
Branch: refs/heads/master
Commit: aa585e3428eac44418e891d8cdf2fc926bb10e6c
Parents: 3af2ce3
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Fri Feb 6 14:49:32 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Mon Mar 16 11:40:04 2015 +0100
----------------------------------------------------------------------
.../network/router/VirtualNetworkApplianceManagerImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa585e34/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 588a354..5d59813 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1077,19 +1077,19 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
continue;
}
checkedNetwork.add(routerGuestNtwkId);
-
+
final List<DomainRouterVO> checkingRouters;
- Long vpcId = router.getVpcId();
+ final Long vpcId = router.getVpcId();
if (vpcId != null) {
checkingRouters = _routerDao.listByVpcId(vpcId);
} else {
checkingRouters = _routerDao.listByNetworkAndRole(routerGuestNtwkId, Role.VIRTUAL_ROUTER);
}
-
+
if (checkingRouters.size() != 2) {
continue;
}
-
+
DomainRouterVO masterRouter = null;
DomainRouterVO backupRouter = null;
for (final DomainRouterVO r : checkingRouters) {