commit | 4ff01342ada2be76fe8cb86e396f3dfb7d682a36 | [log] [tgz] |
---|---|---|
author | Pier Ventre <pierventre@hotmail.com> | Sat Nov 19 21:14:30 2016 -0800 |
committer | Thomas Vachuska <tom@onlab.us> | Wed Nov 30 21:11:25 2016 +0000 |
tree | 97d54a3a5a16bb8f74cdf2c530330963c5ab15d3 | |
parent | 458b8262885ccccd10bb29af2401a5a4244735e5 [diff] |
Fixes equals of ofdpa vid and ofdpa ovid Change-Id: Ie11e555840cba20a8ea7468087342f15b12ead48
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java index 168eed5..7ac70ab 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java +++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/Ofdpa3MatchOvid.java
@@ -64,7 +64,7 @@ if (this == obj) { return true; } - if (obj instanceof Ofdpa3MatchOvid) { + if (obj != null && obj.getClass() == Ofdpa3MatchOvid.class) { Ofdpa3MatchOvid that = (Ofdpa3MatchOvid) obj; return Objects.equals(this.vlanId(), that.vlanId());
diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java index c1226b0..9a54871 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java +++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/OfdpaMatchVlanVid.java
@@ -88,7 +88,7 @@ if (this == obj) { return true; } - if (obj instanceof OfdpaMatchVlanVid) { + if (obj != null && obj.getClass() == OfdpaMatchVlanVid.class) { OfdpaMatchVlanVid that = (OfdpaMatchVlanVid) obj; return Objects.equals(vlanId, that.vlanId);