commit 85573f4decd4496de01dfe504d6fbf81b5531bfe
author Jian Li <pyguni@gmail.com> Wed Jun 27 22:29:14 2018 +0900
committer Jian Li <pyguni@gmail.com> Thu Jun 28 05:14:47 2018 +0000
tree 00b69bb3a6aa53c3165d7dd5cbf99e1525ed36ec
parent 41c652c6ef13147fcc7bbc87a5a40b49ce747b97

Fix: resolve NPE caused by non-existence of IP protocol

Change-Id: I8f2233637986089b9347da03221db2852faa7fe7

apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java

diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
index 3f56362..a631abc 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
@@ -142,12 +142,13 @@
 
     @Override
     public boolean roughEquals(FlowInfo flowInfo) {
-        return deviceId.equals(flowInfo.deviceId()) &&
-                srcIp.equals(flowInfo.srcIp()) &&
-                dstIp.equals(flowInfo.dstIp()) &&
-                srcPort.equals(flowInfo.srcPort()) &&
-                dstPort.equals(flowInfo.dstPort()) &&
-                (protocol == flowInfo.protocol());
+        final DefaultFlowInfo other = (DefaultFlowInfo) flowInfo;
+        return Objects.equals(this.deviceId, other.deviceId) &&
+                Objects.equals(this.srcIp, other.srcIp) &&
+                Objects.equals(this.dstIp, other.dstIp) &&
+                Objects.equals(this.srcPort, other.srcPort) &&
+                Objects.equals(this.dstPort, other.dstPort) &&
+                Objects.equals(this.protocol, other.protocol);
     }
 
     @Override