Return-Path: 
 <commits-return-48261-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 91F1310734
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Mon, 16 Feb 2015 16:47:56 +0000 (UTC)
Received: (qmail 51739 invoked by uid 500); 16 Feb 2015 16:47:44 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 51696 invoked by uid 500); 16 Feb 2015 16:47:44 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 50444 invoked by uid 99); 16 Feb 2015 16:47:43 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Feb 2015 16:47:43 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 699C3E08EB; Mon, 16 Feb 2015 16:47:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dahn@apache.org
To: commits@cloudstack.apache.org
Date: Mon, 16 Feb 2015 16:48:23 -0000
Message-Id: <5826917ff24b4a618466e115158965a8@git.apache.org>
In-Reply-To: <01c69cd6b912462c96d5f8bdd3339ac2@git.apache.org>
References: <01c69cd6b912462c96d5f8bdd3339ac2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [42/50] [abbrv] git commit: updated
 refs/heads/feature/systemvm-persistent-config to 8620642

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/e9bbc648
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9bbc648
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9bbc648

Branch: refs/heads/feature/systemvm-persistent-config
Commit: e9bbc64850440537115fcc8f6c303f54c85027ef
Parents: 31eb158
Author: wilderrodrigues <wrodrigues@schubergphilis.com>
Authored: Fri Feb 6 14:49:32 2015 +0100
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Mon Feb 16 16:08:45 2015 +0100

----------------------------------------------------------------------
 .../network/router/VirtualNetworkApplianceManagerImpl.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9bbc648/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) {