From 0ec4217aae5cbfd7702c981fca524b77952b7ccc Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 14 Feb 2013 17:11:05 +0530 Subject: [PATCH] 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 --- server/src/com/cloud/network/rules/RulesManagerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 6c1e27a5e64..39d81e6d7f2 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");