commit | dfe6e3bd051ea911a2eceebd0904746967522b52 | [log] [tgz] |
---|---|---|
author | Yuta HIGUCHI <y-higuchi@onlab.us> | Thu Oct 30 11:31:51 2014 -0700 |
committer | Yuta HIGUCHI <y-higuchi@onlab.us> | Thu Oct 30 12:10:24 2014 -0700 |
tree | 619e5e108172837323b583372174a087522e466f | |
parent | 8cd66a53aaf56f9342331a5e3cd7caafcdcaab43 [diff] |
allow null Master in MastershipTerm Change-Id: I840354eb6d0b5a1bac91887a41626c33c49d592c
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java b/core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java index 91e3868..e1731ef 100644 --- a/core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java +++ b/core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java
@@ -55,13 +55,8 @@ } if (other instanceof MastershipTerm) { MastershipTerm that = (MastershipTerm) other; - if (!this.master.equals(that.master)) { - return false; - } - if (this.termNumber != that.termNumber) { - return false; - } - return true; + return Objects.equals(this.master, that.master) && + Objects.equals(this.termNumber, that.termNumber); } return false; }