Repository: cloudstack Updated Branches: refs/heads/master 493fd1705 -> 4bf321bd0
Remove dead code Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/28333664 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/28333664 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/28333664 Branch: refs/heads/master Commit: 28333664159dd618682b0b07352782af641d295d Parents: 70e68be Author: Hugo Trippaers <htrippa...@schubergphilis.com> Authored: Tue Jul 22 13:11:11 2014 +0200 Committer: Hugo Trippaers <htrippa...@schubergphilis.com> Committed: Tue Jul 22 13:12:47 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/element/VirtualRouterElement.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28333664/server/src/com/cloud/network/element/VirtualRouterElement.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index fd15ee3..e4660b7 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -72,9 +72,9 @@ import com.cloud.network.dao.VirtualRouterProviderDao; import com.cloud.network.lb.LoadBalancingRule; import com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy; import com.cloud.network.lb.LoadBalancingRulesManager; +import com.cloud.network.router.VirtualRouter; import com.cloud.network.router.VirtualRouter.Role; import com.cloud.network.router.VpcVirtualNetworkApplianceManager; -import com.cloud.network.router.VirtualRouter; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.LbStickinessMethod; import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType; @@ -89,8 +89,8 @@ import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.utils.Pair; import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.crypt.DBEncryptionUtil; +import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.DomainRouterVO; @@ -335,8 +335,6 @@ NetworkMigrationResponder, AggregatedCommandExecutor { for (Pair<String, String> paramKV : paramsList) { String key = paramKV.first(); String value = paramKV.second(); - if ("cookie-name".equalsIgnoreCase(key)) { - } if ("length".equalsIgnoreCase(key)) length = value; if ("holdtime".equalsIgnoreCase(key))