diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-03-14 01:01:14 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-14 01:01:14 +0000 |
commit | 5bac2465e7ee4e136ebec0b65f8e52ef8b4df232 (patch) | |
tree | 1ccd78f3152c19de6c7f14861b1a7d2d7ae92efa /src/net/cbaines/suma/Bus.java | |
parent | 93c8cd480ea46d49dd7ad1ba9515443797a4a8c1 (diff) | |
parent | 19e189ef9ed67f382fea00e48f997ce8e979f030 (diff) | |
download | southamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar southamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar.gz |
Merge branch 'dev'
Diffstat (limited to 'src/net/cbaines/suma/Bus.java')
-rw-r--r-- | src/net/cbaines/suma/Bus.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/net/cbaines/suma/Bus.java b/src/net/cbaines/suma/Bus.java index 865384f..9894e6b 100644 --- a/src/net/cbaines/suma/Bus.java +++ b/src/net/cbaines/suma/Bus.java @@ -115,7 +115,7 @@ public class Bus { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + gid; + result = prime * result + ((id == null) ? 0 : id.hashCode()); return result; } @@ -128,7 +128,10 @@ public class Bus { if (getClass() != obj.getClass()) return false; Bus other = (Bus) obj; - if (id != other.id) + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) return false; return true; } |