incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: refs/heads/4.0 - ignore unassignIPFromVpcNetwork in finally block of EnableStaticNat
Date Thu, 14 Feb 2013 11:42:43 GMT
Updated Branches:
  refs/heads/4.0 2dff2a85f -> 0ec4217aa


ignore unassignIPFromVpcNetwork in finally block of EnableStaticNat

unassignIPFromVpcNetwork processing should not execute when
EnableStaticNat succeed.  Without this patch, unassignIPFromVpcNetwork
will execute whenever EnableStaticNat is successful or failed

Reviewed-by: https://reviews.apache.org/r/9443/
Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0ec4217a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0ec4217a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0ec4217a

Branch: refs/heads/4.0
Commit: 0ec4217aae5cbfd7702c981fca524b77952b7ccc
Parents: 2dff2a8
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Thu Feb 14 17:11:05 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Thu Feb 14 17:12:30 2013 +0530

----------------------------------------------------------------------
 .../com/cloud/network/rules/RulesManagerImpl.java  |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0ec4217a/server/src/com/cloud/network/rules/RulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java
index 6c1e27a..39d81e6 100755
--- a/server/src/com/cloud/network/rules/RulesManagerImpl.java
+++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java
@@ -471,6 +471,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager
{
                 // enable static nat on the backend
                 s_logger.trace("Enabling static nat for ip address " + ipAddress + " and
vm id=" + vmId + " on the backend");
                 if (applyStaticNatForIp(ipId, false, caller, false)) {
+                    performedIpAssoc = false; // ignore unassignIPFromVpcNetwork in finally
block
                     return true;
                 } else {
                     s_logger.warn("Failed to enable static nat rule for ip address " + ipId
+ " on the backend");


Mime
View raw message