From 44418a053cb5bccb6d7945a648ea1fcbf648a620 Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Tue, 13 Sep 2011 15:06:06 -0700
Subject: [PATCH] fix firwall/nat rule

---
 .../virtualnetwork/VirtualRoutingResource.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 5fa68c094e7..cbc5e1ebdf6 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -185,11 +185,11 @@ public class VirtualRoutingResource implements Manager {
             command.add("-r ", rule.getDstIp());
             command.add("-d ", rule.getStringDstPortRange());
             result = command.execute();
-            if (result == null || result.isEmpty()) {
+            if (result == null) {
+                results[i++] = null;
+            } else {
                 results[i++] = "Failed";
                 endResult = false;
-            } else {
-                results[i++] = null;
             }
         }
 
@@ -219,11 +219,11 @@ public class VirtualRoutingResource implements Manager {
             command.add(" -G ") ;
             
             result = command.execute();
-            if (result == null || result.isEmpty()) {
+            if (result == null) {
+                results[i++] = null;
+            } else {
                 results[i++] = "Failed";
                 endResult = false;
-            } else {
-                results[i++] = null;
             }
         }