From: James Procter <j.procter@dundee.ac.uk>
Date: Fri, 20 Oct 2023 12:56:01 +0000 (+0100)
Subject: JAL-4307 some models return null for hetatm list
X-Git-Tag: Release_2_11_3_0~3^2~31^2~1^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=e1d3e0e3ae13f29c0c027e94cd23d05dd9ed4360

JAL-4307 some models return null for hetatm list
---

diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java
index c8ce3cd..5b931e1 100644
--- a/src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/src/jalview/ext/jmol/JalviewJmolBinding.java
@@ -43,8 +43,6 @@ import org.jmol.api.JmolViewer;
 import org.jmol.c.CBK;
 import org.jmol.viewer.Viewer;
 
-import com.google.common.collect.Lists;
-
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
 import jalview.api.FeatureSettingsModelI;
@@ -200,7 +198,10 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
     for (int mc=0;mc<jmolViewer.ms.mc; mc++)
     {
       Map<String,String> hets = jmolViewer.ms.getHeteroList(mc);
-      hetlist.putAll(hets);
+      if (hets!=null)
+      {
+        hetlist.putAll(hets);
+      }
     }
     return Arrays.asList(hetlist.keySet().toArray(new String[0]));
   }