From e3a32867586bbcebe04b009755bfcc116eb1a296 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Fri, 24 May 2013 17:08:31 -0700
Subject: [PATCH] CLOUDSTACK-2681: Suppress failed to apply port forwarding
 rule error when rollback

---
 .../command/user/firewall/CreatePortForwardingRuleCmd.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index 40128526ce0..549de76f2c6 100644
--- a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -198,7 +198,11 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
                     _firewallService.revokeRelatedFirewallRule(getEntityId(), true);
                 }
 
-                _rulesService.revokePortForwardingRule(getEntityId(), true);
+                try {
+                    _rulesService.revokePortForwardingRule(getEntityId(), true);
+                } catch (Exception ex){
+                    //Ignore e.g. failed to apply rules to device error
+                }
 
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to apply port forwarding rule");
             }