Fix method getFlowEntriesForGroup in forwardingrulesmanager

Signed-off-by: Sapan Shah <sapshah@cisco.com>

diff --git a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java
index 4365db30668cdd9b635545e77db5af7893b9c300..5fbe12bd1ca44218a9629e50489540bd85d83302 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java
+++ b/opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java
@@ -1041,13 +1041,11 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager,
 
     @Override
     public List<FlowEntry> getFlowEntriesForGroup(String policyName) {
 
     @Override
     public List<FlowEntry> getFlowEntriesForGroup(String policyName) {

-        List<FlowEntry> list = null;
+        List<FlowEntry> list = new ArrayList<FlowEntry>();

         if (this.groupFlows != null && this.groupFlows.containsKey(policyName)) {
         if (this.groupFlows != null && this.groupFlows.containsKey(policyName)) {

-            list = new ArrayList<FlowEntry>();

             for (FlowEntryInstall entries : groupFlows.get(policyName)) {
                 list.add(entries.getOriginal());
             }
             for (FlowEntryInstall entries : groupFlows.get(policyName)) {
                 list.add(entries.getOriginal());
             }

-            return new ArrayList<FlowEntry>();

         }
         return list;
     }
         }
         return list;
     }