JAL-2488 patch causes of NPE during testStoreAndRecoverExpandedviews Jalview2xml...

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 82f3565..2727db1 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -155,7 +155,10 @@ public class TreePanel extends GTreePanel
       @Override
       public void internalFrameClosed(InternalFrameEvent evt)
       {
-        av.removePropertyChangeListener(listener);
+        if (av != null)
+        {
+          av.removePropertyChangeListener(listener);
+        }
       }
     });
 

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index fdad0ce..a0cbff4 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -1338,7 +1338,10 @@ public abstract class AlignmentViewport
   public void removePropertyChangeListener(
           java.beans.PropertyChangeListener listener)
   {
-    changeSupport.removePropertyChangeListener(listener);
+    if (changeSupport != null)
+    {
+      changeSupport.removePropertyChangeListener(listener);
+    }
   }
 
   /**