Merge branch 'dev'

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;
 	}