From: jprocter <Jim Procter>
Date: Fri, 24 Jul 2009 15:25:56 +0000 (+0000)
Subject: catch null pointer exception in headless context
X-Git-Tag: Release_2_5~223
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=73b5b4053900fc52186c0c73518ff245a4aab95a;p=jalview.git

catch null pointer exception in headless context
---

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 0f6dbf4..1b24694 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -964,6 +964,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   public static AlignmentPanel[] getAlignmentPanels(String viewId)
   {
     int count = 0;
+    if (Desktop.desktop==null)
+    {
+      // no frames created and in headless mode
+      // TODO: verify that frames are recoverable when in headless mode
+      return null;
+    }
     JInternalFrame[] frames = Desktop.desktop.getAllFrames();
     ArrayList aps = new ArrayList();
     for (int t = 0; t < frames.length; t++)