From 691b9a471cf286d6c8f2e9af9652660c2c00a025 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Fri, 18 May 2012 11:49:29 +0530
Subject: [PATCH] CS-14966. When a group has no ingress rules
 ec2-describe-group does not list this group.

---
 .../cloud/bridge/service/core/ec2/EC2GroupFilterSet.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
index 29ded60bec4..19a161dd22c 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2GroupFilterSet.java
@@ -93,8 +93,10 @@ public class EC2GroupFilterSet {
                     }
                 }
             }
-            if (matched && ipPermissionFilterMatched(group, ipPermissionFilterSet))
-                resultList.addGroup( group );
+            if (matched) {
+                if (ipPermissionFilterSet.isEmpty() || ipPermissionFilterMatched(group, ipPermissionFilterSet))
+                    resultList.addGroup( group );
+            }
         }
         return resultList;
     }