Merge "Fix NPE and enhance flows table"

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
index abad0b2ab5d5984cee70063697f9109b297602ac..e2945628868d0b4e1b6477e2f4285353f0d3f941 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
@@ -19,9 +19,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Utility class for converting openflow description statistics into SAL
  * NodeDescription object
- * 
- * 
- * 
  */
 public class DescStatisticsConverter {
     private static final Logger log = LoggerFactory
@@ -31,7 +28,8 @@ public class DescStatisticsConverter {
 
     public DescStatisticsConverter(List<OFStatistics> statsList) {
         this.hwDesc = null;
-        this.ofDesc = (OFDescriptionStatistics) statsList.get(0);
+        this.ofDesc = (statsList == null || statsList.isEmpty())? 
+                null : (OFDescriptionStatistics) statsList.get(0);
     }
 
     public NodeDescription getHwDescription() {