X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignmentAnnotation.java;h=f7bf4d80c44569d86bcf18578bc448c2f47502eb;hb=94814d1d6b542c2a4f4e75787f30562716269fdb;hp=ffc31050f092dcf99163e12e043ae772d514f807;hpb=06f7fc9313488587d9c0158b830ff66a68336ce3;p=jalview.git

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index ffc3105..f7bf4d8 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -1530,7 +1530,9 @@ public class AlignmentAnnotation
     }
     for (AlignmentAnnotation a : list)
     {
-      if (calcId.equals(a.getCalcId()))
+
+      if (a.getCalcId() == calcId || (a.getCalcId() != null
+              && calcId != null && a.getCalcId().equals(calcId)))
       {
         aa.add(a);
       }