commit af75c13b9b53cf1fe5b4f9e3122266b382dfc6df
author Jordi Ortiz <jordi.ortiz@um.es> Thu Jun 22 16:06:36 2017 +0200
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Wed Jun 28 15:58:47 2017 +0000
tree 8a56db56cf4cc3deabc255725fcd8cce6bd63b69
parent 9287b639aaf13948a4d8d33bda1f48319a30ef3f

FIX: Set band.type in MeterStats to avoid nullpointer in meter related operations (e.g, removal).

Change-Id: I0ff8ee537f0e4f8068f494799ef72d282b33f471

providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java

diff --git a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
index 147e124..9c4ccab 100644
--- a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
+++ b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
@@ -324,11 +324,11 @@
 
     private Collection<Band> buildBands(List<OFMeterBandStats> bandStats) {
         return bandStats.stream().map(stat -> {
-            DefaultBand band = DefaultBand.builder().build();
+            DefaultBand band = ((DefaultBand.Builder) DefaultBand.builder().ofType(DefaultBand.Type.DROP)).build();
             band.setBytes(stat.getByteBandCount().getValue());
             band.setPackets(stat.getPacketBandCount().getValue());
             return band;
-        }).collect(Collectors.toSet());
+        }).collect(Collectors.toList());
     }
 
     private void signalMeterError(OFMeterModFailedErrorMsg meterError,