JAL-4446 avoid NPE when progress bar message is null

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 394ef65..c1ad996 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -2939,7 +2939,11 @@ public class Desktop extends jalview.jbgui.GDesktop
     else
     {
       progressBars.put(Long.valueOf(id), addProgressPanel(message));
-      progressBarMessages.put(id, message);
+      if (message!=null) {
+        progressBarMessages.put(id, message);
+      } else {
+        progressBarMessages.remove(id);
+      }
     }
   }
 

diff --git a/src/jalview/gui/ProgressBar.java b/src/jalview/gui/ProgressBar.java
index e6ee641..37a4b94 100644 (file)
--- a/src/jalview/gui/ProgressBar.java
+++ b/src/jalview/gui/ProgressBar.java
@@ -157,13 +157,13 @@ public class ProgressBar implements IProgressIndicator
           JProgressBar progressBar = new JProgressBar();
           progressBar.setIndeterminate(true);
           
-          progressPanel.add(new JLabel(message), BorderLayout.WEST);
+          progressPanel.add(new JLabel(message==null ? "" : message), BorderLayout.WEST);
           progressPanel.add(progressBar, BorderLayout.CENTER);
 
           addRow(progressPanel);
 
           progressBars.put(id, progressPanel);
-          progressBarMessages.put(id, message);
+          progressBarMessages.put(id, message == null ? "" : message);
         }
 
         refreshLayout();