X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FMapping.java;h=559ae4cd8b05b9552fa26ca0f0da58bd00b53b85;hb=cf491d18e6affbfacfc67eda7c6bceedd457982f;hp=59dc8ff3207ac1f064c5f1d33fac433562083fc5;hpb=e309b8d9bd62fb304fdd612c7385e76027d2f2d7;p=jalview.git

diff --git a/src/jalview/datamodel/Mapping.java b/src/jalview/datamodel/Mapping.java
index 59dc8ff..559ae4c 100644
--- a/src/jalview/datamodel/Mapping.java
+++ b/src/jalview/datamodel/Mapping.java
@@ -348,6 +348,8 @@ public class Mapping
   @Override
   public boolean equals(Object o)
   {
+    // TODO should override Object.hashCode() to ensure that equal objects have
+    // equal hashcodes
     if (o == null || !(o instanceof Mapping))
     {
       return false;
@@ -366,7 +368,7 @@ public class Mapping
     {
       return false;
     }
-    if (map.equals(other.map))
+    if ((map == null && other.map == null) || map.equals(other.map))
     {
       return true;
     }