JAL-2110 catch case when updateDBRef argument has null version string
authorJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 08:59:58 +0000 (09:59 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 08:59:58 +0000 (09:59 +0100)
src/jalview/datamodel/DBRefEntry.java

index 66a075e..efdf0ac 100755 (executable)
@@ -150,6 +150,7 @@ public class DBRefEntry implements DBRefEntryI
      * otherwise the versions have to match
      */
     String otherVersion = other.getVersion();
+      
     if ((version == null || version.equals("0") || version.endsWith(":0"))
             && otherVersion != null)
     {
@@ -157,7 +158,9 @@ public class DBRefEntry implements DBRefEntryI
     }
     else
     {
-      if (!version.equalsIgnoreCase(otherVersion))
+      if (version != null
+              && (otherVersion == null || !version
+                      .equalsIgnoreCase(otherVersion)))
       {
         return false;
       }