홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
b3ef0db9 1 parent 5f8a5294

ONOS-4395 Fix NPE in OpenFlowDeviceProvider 

Following gerrit #8858

Change-Id: I55cc4d9ee028e11e099657752a12d2c026893a59
Inline Side-by-side
Showing 1 changed file with 5 additions and 6 deletions
......@@ -311,10 +311,6 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
List<OFPortStatsEntry> entries) {
HashSet<PortStatistics> stats = Sets.newHashSet();
if (entries == null) {
return Collections.unmodifiableSet(stats);
}
for (OFPortStatsEntry entry : entries) {
try {
if (entry == null || entry.getPortNo() == null || entry.getPortNo().getPortNumber() < 0) {
......@@ -793,8 +789,11 @@ public class OpenFlowDeviceProvider extends AbstractProvider implements DevicePr
portStatsReplyList.addAll(portStatsReply.getEntries());
portStatsReplies.put(dpid, portStatsReplyList);
if (!portStatsReply.getFlags().contains(OFStatsReplyFlags.REPLY_MORE)) {
pushPortMetrics(dpid, portStatsReplies.get(dpid));
portStatsReplies.get(dpid).clear();
List<OFPortStatsEntry> statsEntries = portStatsReplies.get(dpid);
if (statsEntries != null) {
pushPortMetrics(dpid, statsEntries);
statsEntries.clear();
}
}
}
break;
......