Fixing a recent breakage in Flow programmer introduced by https://git.opendaylight...

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / internal / FlowStatisticsConverter.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java
index 7afe6ce5be9a863d49938aa80c1576ef68e4ecf4..74af3db5ef9465e519f36cd5f35e36f196f3f336 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/FlowStatisticsConverter.java
@@ -9,6 +9,7 @@
 package org.opendaylight.controller.protocol_plugin.openflow.internal;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.opendaylight.controller.protocol_plugin.openflow.vendorextension.v6extension.V6StatsReply;
@@ -23,9 +24,9 @@ import org.slf4j.LoggerFactory;
 /**
  * Converts an openflow list of flow statistics in a SAL list of FlowOnNode
  * objects
- * 
- * 
- * 
+ *
+ *
+ *
  */
 public class FlowStatisticsConverter {
     private static final Logger log = LoggerFactory
@@ -34,11 +35,10 @@ public class FlowStatisticsConverter {
     private List<FlowOnNode> flowOnNodeList;
 
     public FlowStatisticsConverter(List<OFStatistics> statsList) {
-        if (statsList == null) {// || statsList.isEmpty()) {
-            this.ofStatsList = new ArrayList<OFStatistics>(1); // dummy list
+        if (statsList == null) {
+            this.ofStatsList = Collections.emptyList();
         } else {
-            this.ofStatsList = statsList; // new
-                                          // ArrayList<OFStatistics>(statsList);
+            this.ofStatsList = statsList;
         }
         this.flowOnNodeList = null;
     }
@@ -59,6 +59,7 @@ public class FlowStatisticsConverter {
                     flow.setPriority(ofFlowStat.getPriority());
                     flow.setIdleTimeout(ofFlowStat.getIdleTimeout());
                     flow.setHardTimeout(ofFlowStat.getHardTimeout());
+                    flow.setId(ofFlowStat.getCookie());
                     flowOnNode = new FlowOnNode(flow);
                     flowOnNode.setByteCount(ofFlowStat.getByteCount());
                     flowOnNode.setPacketCount(ofFlowStat.getPacketCount());
@@ -74,6 +75,7 @@ public class FlowStatisticsConverter {
                     flow.setPriority(v6StatsReply.getPriority());
                     flow.setIdleTimeout(v6StatsReply.getIdleTimeout());
                     flow.setHardTimeout(v6StatsReply.getHardTimeout());
+                    flow.setId(v6StatsReply.getCookie());
                     flowOnNode = new FlowOnNode(flow);
                     flowOnNode.setByteCount(v6StatsReply.getByteCount());
                     flowOnNode.setPacketCount(v6StatsReply.getPacketCount());