| commit | a371e7ad25f444f0782962c618f4696822a07d6f | [log] [tgz] |
|---|---|---|
| author | Jian Li <pyguni@gmail.com> | Wed Apr 06 17:40:41 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Fri Apr 08 01:00:45 2016 +0000 |
| tree | aa6eaaae4d2f9a19ffe37e77a38cb0312aafdd49 | |
| parent | c23b6267126d175dc007afa6263212c3ebe64295 [diff] |
Resolve NPE during control message aggregation Change-Id: I1945a3ec23fbe6c54af53845b89f489fa9857605
diff --git a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java index c9d0063..3f4b64d 100644 --- a/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java +++ b/providers/openflow/message/src/main/java/org/onosproject/provider/of/message/impl/OpenFlowControlMessageProvider.java
@@ -209,7 +209,10 @@ if (msg.getType() == OFType.PACKET_IN || msg.getType() == OFType.FLOW_MOD || msg.getType() == OFType.STATS_REPLY) { - aggregators.get(dpid).increment(msg); + aggregators.computeIfPresent(dpid, (k, v) -> { + v.increment(msg); + return v; + }); } } } @@ -221,7 +224,10 @@ @Override public void handleMessage(Dpid dpid, OFMessage msg) { - aggregators.get(dpid).increment(msg); + aggregators.computeIfPresent(dpid, (k, v) -> { + v.increment(msg); + return v; + }); } } }