You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mu...@apache.org on 2014/03/14 12:27:13 UTC
[14/14] git commit: updated refs/heads/master to 7d20b08
findbug fixes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d20b08a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d20b08a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d20b08a
Branch: refs/heads/master
Commit: 7d20b08aa9a05e20079e5c21ac7950f2b8879507
Parents: 81f6e66
Author: Murali Reddy <mu...@gmail.com>
Authored: Fri Mar 14 16:54:12 2014 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Fri Mar 14 16:56:39 2014 +0530
----------------------------------------------------------------------
.../ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d20b08a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
index 21e9058..53607fc 100644
--- a/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
+++ b/plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
@@ -531,7 +531,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
}
}
} catch (Exception e) {
- s_logger.warn(String.format("Destroy tunnel failed", e));
+ s_logger.warn("Destroy tunnel failed", e);
}
}
}
@@ -812,7 +812,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
try {
NetworkVO network = (NetworkVO) args;
String bridgeName=generateBridgeNameForVpc(network.getVpcId());
- if (network.getVpcId() != null & isVpcEnabledForDistributedRouter(network.getVpcId())) {
+ if (network.getVpcId() != null && isVpcEnabledForDistributedRouter(network.getVpcId())) {
long vpcId = network.getVpcId();
OvsVpcRoutingPolicyConfigCommand cmd = prepareVpcRoutingPolicyUpdate(vpcId);
List<Long> vpcSpannedHostIds = _ovsNetworkToplogyGuru.getVpcSpannedHosts(vpcId);