From 862a2b1ffe312f1d58a480c438ac5f8daae74468 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 27 Nov 2014 10:35:58 +0000 Subject: [PATCH] JAL-674 patch NPE bug when test run in isolation --- test/jalview/io/Jalview2xmlTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/jalview/io/Jalview2xmlTests.java b/test/jalview/io/Jalview2xmlTests.java index 32aa84a..fec7d75 100644 --- a/test/jalview/io/Jalview2xmlTests.java +++ b/test/jalview/io/Jalview2xmlTests.java @@ -237,7 +237,8 @@ public class Jalview2xmlTests @Test public void gatherViewsHere() throws Exception { - int origCount = Desktop.getAlignframes().length; + int origCount = Desktop.getAlignframes() == null ? 0 : Desktop + .getAlignframes().length; AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded( "examples/exampleFile_2_7.jar", FormatAdapter.FILE); assertTrue("Didn't read in the example file correctly.", af != null); -- 1.7.10.2